diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-22 21:30:54 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-22 21:30:54 +0000 |
| commit | 66d4bdd114e2bed46b4da84894793e331e7e90e0 (patch) | |
| tree | 549c03dce546b1a5f06ff39f921dfd8a0c4f899c | |
| parent | a97c07fb2e70c2076c2da3def4a0da361540d4bd (diff) | |
* configure.in (SITE_DIR, VENDOR_DIR),
version.c (ruby_initial_load_paths): exclude directories that
are configured without them from $LOAD_PATH. [ruby-core:33267]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29877 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.in | 12 | ||||
| -rw-r--r-- | version.c | 4 |
3 files changed, 19 insertions, 3 deletions
@@ -1,4 +1,8 @@ -Tue Nov 23 06:30:18 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> +Tue Nov 23 06:30:51 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (SITE_DIR, VENDOR_DIR), + version.c (ruby_initial_load_paths): exclude directories that + are configured without them from $LOAD_PATH. [ruby-core:33267] * configure.in (rubylibprefix): No ruby, No libprefix. diff --git a/configure.in b/configure.in index 2286988926..36a58d43ab 100644 --- a/configure.in +++ b/configure.in @@ -2713,8 +2713,16 @@ else fi AC_DEFINE_UNQUOTED(RUBY_EXEC_PREFIX, "${RUBY_EXEC_PREFIX}") AC_DEFINE_UNQUOTED(RUBY_LIB_PREFIX, ${RUBY_LIB_PREFIX}) -AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, ${RUBY_SITE_LIB_PATH}) -AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB, ${RUBY_VENDOR_LIB_PATH}) +if test "x$SITE_DIR" = xno; then + AC_DEFINE(NO_RUBY_SITE_LIB) +else + AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, ${RUBY_SITE_LIB_PATH}) +fi +if test "x$VENDOR_DIR" = xno; then + AC_DEFINE(NO_RUBY_VENDOR_LIB) +else + AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB, ${RUBY_VENDOR_LIB_PATH}) +fi AC_SUBST(arch)dnl AC_SUBST(sitearch)dnl @@ -69,19 +69,23 @@ const char ruby_initial_load_paths[] = #ifdef RUBY_SEARCH_PATH RUBY_SEARCH_PATH "\0" #endif +#ifndef NO_RUBY_SITE_LIB RUBY_SITE_LIB2 "\0" #ifdef RUBY_SITE_THIN_ARCHLIB RUBY_SITE_THIN_ARCHLIB "\0" #endif RUBY_SITE_ARCHLIB "\0" RUBY_SITE_LIB "\0" +#endif +#ifndef NO_RUBY_VENDOR_LIB RUBY_VENDOR_LIB2 "\0" #ifdef RUBY_VENDOR_THIN_ARCHLIB RUBY_VENDOR_THIN_ARCHLIB "\0" #endif RUBY_VENDOR_ARCHLIB "\0" RUBY_VENDOR_LIB "\0" +#endif RUBY_LIB "\0" #ifdef RUBY_THIN_ARCHLIB |