yugui	2008-11-19 01:47:50 +0900 (Wed, 19 Nov 2008)

  New Revision: 20266

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

  Log:
    merges r20239 from trunk into ruby_1_9_1
    * configure.in (LIBRUBYARG_STATIC): fixed for --enable-rpath.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/configure.in

Index: ruby_1_9_1/configure.in
===================================================================
--- ruby_1_9_1/configure.in	(revision 20265)
+++ ruby_1_9_1/configure.in	(revision 20266)
@@ -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: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 20265)
+++ ruby_1_9_1/ChangeLog	(revision 20266)
@@ -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

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