nobu	2008-11-17 02:19:05 +0900 (Mon, 17 Nov 2008)

  New Revision: 20239

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

  Log:
    * configure.in (LIBRUBYARG_STATIC): fixed for --enable-rpath.

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/configure.in
    branches/ruby_1_8/version.h
    trunk/ChangeLog
    trunk/configure.in
    trunk/version.h

Index: configure.in
===================================================================
--- configure.in	(revision 20238)
+++ configure.in	(revision 20239)
@@ -1673,9 +1673,9 @@
 AC_ARG_ENABLE(shared,
        [  --enable-shared         build a shared library for Ruby. ],
        [enable_shared=$enableval])
+LIBRUBYARG_SHARED='-l$(RUBY_SO_NAME)'
 if test "$enable_shared" = 'yes'; then
   LIBRUBY='$(LIBRUBY_SO)'
-  LIBRUBYARG_SHARED='-l$(RUBY_SO_NAME)'
   LIBRUBYARG='$(LIBRUBYARG_SHARED)'
   CFLAGS="$CFLAGS $CCDLFLAGS"
   ENABLE_SHARED=yes
@@ -1752,7 +1752,9 @@
   esac
 fi
 if test "$enable_rpath" = yes; then
-    LIBRUBYARG_SHARED="${linker_flag}-R ${linker_flag}\$(libdir) -L\$(libdir) $LIBRUBYARG_SHARED"
+    LIBRUBY_RPATHFLAGS="${linker_flag}-R ${linker_flag}\$(libdir) -L\$(libdir)"
+    LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
+    LIBRUBYARG_STATIC="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_STATIC"
 fi
 
 LDFLAGS="-L. $LDFLAGS"
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 20238)
+++ ChangeLog	(revision 20239)
@@ -1,3 +1,7 @@
+Mon Nov 17 02:19:03 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (LIBRUBYARG_STATIC): fixed for --enable-rpath.
+
 Sat Nov 15 22:46:32 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* re.c (rb_reg_regsub): returns -1 unless ascii as well as
Index: version.h
===================================================================
--- version.h	(revision 20238)
+++ version.h	(revision 20239)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2008-11-15"
+#define RUBY_RELEASE_DATE "2008-11-17"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20081115
+#define RUBY_RELEASE_CODE 20081117
 #define RUBY_PATCHLEVEL 0
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 15
+#define RUBY_RELEASE_DAY 17
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8/configure.in
===================================================================
--- ruby_1_8/configure.in	(revision 20238)
+++ ruby_1_8/configure.in	(revision 20239)
@@ -1496,9 +1496,9 @@
 AC_ARG_ENABLE(shared,
        [  --enable-shared         build a shared library for Ruby. ],
        [enable_shared=$enableval])
+LIBRUBYARG_SHARED='-l$(RUBY_SO_NAME)'
 if test "$enable_shared" = 'yes'; then
   LIBRUBY='$(LIBRUBY_SO)'
-  LIBRUBYARG_SHARED='-l$(RUBY_SO_NAME)'
   LIBRUBYARG='$(LIBRUBYARG_SHARED)'
   CFLAGS="$CFLAGS $CCDLFLAGS"
   ENABLE_SHARED=yes
@@ -1575,7 +1575,9 @@
   esac
 fi
 if test "$enable_rpath" = yes; then
-    LIBRUBYARG_SHARED="${linker_flag}-R ${linker_flag}\$(libdir) -L\$(libdir) $LIBRUBYARG_SHARED"
+    LIBRUBY_RPATHFLAGS="${linker_flag}-R ${linker_flag}\$(libdir) -L\$(libdir)"
+    LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
+    LIBRUBYARG_STATIC="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_STATIC"
 fi
 
 LDFLAGS="-L. $LDFLAGS"
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 20238)
+++ ruby_1_8/ChangeLog	(revision 20239)
@@ -1,3 +1,7 @@
+Mon Nov 17 02:19:03 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (LIBRUBYARG_STATIC): fixed for --enable-rpath.
+
 Sun Nov 16 10:02:39 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* eval.c (yield_under): fixed initialization not being allowed in C90.
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 20238)
+++ ruby_1_8/version.h	(revision 20239)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2008-11-16"
+#define RUBY_RELEASE_DATE "2008-11-17"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20081116
+#define RUBY_RELEASE_CODE 20081117
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 16
+#define RUBY_RELEASE_DAY 17
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];

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