yugui	2008-12-12 23:53:24 +0900 (Fri, 12 Dec 2008)

  New Revision: 20670

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

  Log:
    merges r20573 and r20574 from trunk into ruby_1_9_1.
    * configure.in (LIBPATHFLAG): use numbered specifier if RPATHFLAG
      is set.  [ruby-talk:322136]

  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 20669)
+++ ruby_1_9_1/configure.in	(revision 20670)
@@ -1291,7 +1291,6 @@
 AC_SUBST(LIBEXT)dnl
 
 STATIC=
-: ${LIBPATHFLAG=' -L%s'}
 : ${PATHFLAG=''}
 
 if test "$with_dln_a_out" != yes; then
@@ -1321,7 +1320,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
 
@@ -1474,6 +1472,12 @@
 	    ;;
     esac
 fi
+case ${RPATHFLAG} in
+*'%1$'*)
+    : ${LIBPATHFLAG=' -L%1$-s'};;
+*)
+    : ${LIBPATHFLAG=' -L%s'};;
+esac
 
 AC_SUBST(LINK_SO)
 AC_SUBST(LIBPATHFLAG)
Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 20669)
+++ ruby_1_9_1/ChangeLog	(revision 20670)
@@ -1,3 +1,8 @@
+Sun Dec  7 23:47:37 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (LIBPATHFLAG): use numbered specifier if RPATHFLAG
+	  is set.  [ruby-talk:322136]
+
 Sat Dec  6 17:51:35 2008  Yuki Sonoda (Yugui)  <yugui@y...>
 
 	* pack.c (pack_pack): 'u0' is not special differently from 'm0'.

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