nobu	2010-11-23 06:30:54 +0900 (Tue, 23 Nov 2010)

  New Revision: 29877

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29877

  Log:
    * 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]

  Modified files:
    trunk/ChangeLog
    trunk/configure.in
    trunk/version.c

Index: configure.in
===================================================================
--- configure.in	(revision 29876)
+++ configure.in	(revision 29877)
@@ -2713,8 +2713,16 @@
 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
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 29876)
+++ ChangeLog	(revision 29877)
@@ -1,5 +1,9 @@
-Tue Nov 23 06:30:18 2010  Nobuyoshi Nakada  <nobu@r...>
+Tue Nov 23 06:30:51 2010  Nobuyoshi Nakada  <nobu@r...>
 
+	* 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.
 
 Tue Nov 23 06:26:26 2010  Nobuyoshi Nakada  <nobu@r...>
Index: version.c
===================================================================
--- version.c	(revision 29876)
+++ version.c	(revision 29877)
@@ -69,19 +69,23 @@
 #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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/