shyouhei	2009-12-14 13:16:07 +0900 (Mon, 14 Dec 2009)

  New Revision: 26094

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

  Log:
    merge revision(s) 20573:
    * configure.in (LIBPATHFLAG): use numbered specifier if RPATHFLAG
      is set.  [ruby-talk:322136]

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/configure.in
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/configure.in
===================================================================
--- ruby_1_8_7/configure.in	(revision 26093)
+++ ruby_1_8_7/configure.in	(revision 26094)
@@ -1113,7 +1113,6 @@
 AC_SUBST(LIBEXT)dnl
 
 STATIC=
-: ${LIBPATHFLAG=' -L%s'}
 : ${PATHFLAG=''}
 
 if test "$with_dln_a_out" != yes; then
@@ -1143,7 +1142,6 @@
        [  --disable-rpath         embed run path into extension libraries.],
        [enable_rpath=$enableval], [enable_rpath="$rb_cv_binary_elf"])
   if test "$enable_rpath" = yes; then
-    LIBPATHFLAG=" -L%1\$-s"
     RPATHFLAG=" ${linker_flag}-R%1\$-s"
   fi
 
@@ -1265,6 +1263,12 @@
   esac
   AC_MSG_RESULT($rb_cv_dlopen)
 fi
+case ${RPATHFLAG} in
+*'%1$'*)
+    : ${LIBPATHFLAG=' -L%1$-s'};;
+*)
+    : ${LIBPATHFLAG=' -L%s'};;
+esac
 AC_SUBST(LINK_SO)
 AC_SUBST(LIBPATHFLAG)
 AC_SUBST(RPATHFLAG)
Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 26093)
+++ ruby_1_8_7/ChangeLog	(revision 26094)
@@ -1,3 +1,8 @@
+Mon Dec 14 13:09:01 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (LIBPATHFLAG): use numbered specifier if RPATHFLAG
+	  is set.  [ruby-talk:322136]
+
 Mon Dec 14 12:53:56 2009  Marc-Andre Lafortune  <ruby-core@m...>
 
 	* lib/bigdecimal.rb: fix comparison operators [ruby-core:26646]
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 26093)
+++ ruby_1_8_7/version.h	(revision 26094)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-12-14"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20091214
-#define RUBY_PATCHLEVEL 237
+#define RUBY_PATCHLEVEL 238
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8

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