nobu	2009-02-19 14:48:14 +0900 (Thu, 19 Feb 2009)

  New Revision: 22436

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

  Log:
    * configure.in, */Makefile.sub (LOAD_RELATIVE): moved from ruby.c

  Modified files:
    trunk/ChangeLog
    trunk/bcc32/Makefile.sub
    trunk/configure.in
    trunk/ruby.c
    trunk/win32/Makefile.sub

Index: configure.in
===================================================================
--- configure.in	(revision 22435)
+++ configure.in	(revision 22436)
@@ -1664,7 +1664,11 @@
     when(nextstep*|openstep*|rhapsody*|darwin*)
 	DLEXT=bundle;;
     when(os2-emx*)
+	LOAD_RELATIVE=1
 	DLEXT=dll;;
+    when(cygwin*|mingw*|*djgpp*)
+	LOAD_RELATIVE=1
+	DLEXT=so;;
     when(*)
 	DLEXT=so;;
   esac
@@ -2132,18 +2136,16 @@
             [vendordir='${libdir}/${RUBY_INSTALL_NAME}/vendor_ruby'])
 VENDOR_DIR=`eval echo \\"${vendordir}\\"`
 
-case "$target_os" in
-  when(cygwin*|mingw*|*djgpp*|os2-emx*)
+if test "${LOAD_RELATIVE+set}"; then
+    AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
     RUBY_LIB_PREFIX="`eval echo "$RUBY_LIB_PREFIX" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
     RUBY_SITE_LIB_PATH="`eval echo "$SITE_DIR" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
     RUBY_VENDOR_LIB_PATH="`eval echo "$VENDOR_DIR" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
-    ;;
-  when(*)
+else
     RUBY_LIB_PREFIX="`eval echo \\"$RUBY_LIB_PREFIX\\" | sed 's|^NONE/|'"$prefix"'/|'`"
     RUBY_SITE_LIB_PATH="`eval echo \\"$SITE_DIR\\" | sed 's|^NONE/|'"$prefix"'/|'`"
     RUBY_VENDOR_LIB_PATH="`eval echo \\"$VENDOR_DIR\\" | sed 's|^NONE/|'"$prefix"'/|'`"
-    ;;
-esac
+fi
 
 pat="$RUBY_LIB_PREFIX/"'\(.*\)'
 RUBY_LIB_PATH='RUBY_LIB_PREFIX"/"RUBY_LIB_VERSION'
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 22435)
+++ ChangeLog	(revision 22436)
@@ -1,3 +1,7 @@
+Thu Feb 19 14:48:12 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in, */Makefile.sub (LOAD_RELATIVE): moved from ruby.c
+
 Thu Feb 19 14:39:53 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* configure.in (darwin): uses -unexported_symbol option of ld instead
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 22435)
+++ win32/Makefile.sub	(revision 22436)
@@ -488,6 +488,7 @@
 !endif
 #define CANONICALIZATION_FOR_MATHN 1
 #define DEFAULT_KCODE KCODE_NONE
+#define LOAD_RELATIVE 1
 #define DLEXT ".so"
 #define RUBY_LIB_VERSION STRINGIZE(RUBY_VERSION_MAJOR)"."STRINGIZE(RUBY_VERSION_MINOR)"."STRINGIZE(RUBY_VERSION_TEENY)
 #define RUBY_LIB_PREFIX "/lib/$(RUBY_INSTALL_NAME)"
Index: bcc32/Makefile.sub
===================================================================
--- bcc32/Makefile.sub	(revision 22435)
+++ bcc32/Makefile.sub	(revision 22436)
@@ -354,6 +354,7 @@
 \#define NEED_IO_SEEK_BETWEEN_RW 1
 \#define STACK_GROW_DIRECTION -1
 \#define DEFAULT_KCODE KCODE_NONE
+\#define LOAD_RELATIVE 1
 \#define DLEXT ".so"
 \#define RUBY_LIB "/lib/ruby/$(MAJOR).$(MINOR).$(TEENY)"
 \#define RUBY_SITE_LIB "/lib/ruby/site_ruby"
Index: ruby.c
===================================================================
--- ruby.c	(revision 22435)
+++ ruby.c	(revision 22436)
@@ -331,10 +331,6 @@
     ruby_push_include(path, expand_include_path);
 }
 
-#if (defined DOSISH || defined __CYGWIN__) && !defined __SYMBIAN32__
-#define LOAD_RELATIVE 1
-#endif
-
 #if defined _WIN32 || defined __CYGWIN__
 static HMODULE libruby;
 

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