From 5918ededfe216a954b85091f888315eb6f8d462f Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 12 Dec 2008 14:53:24 +0000
Subject: merges r20573 and r20574 from trunk into ruby_1_9_1. * configure.in
 (LIBPATHFLAG): use numbered specifier if RPATHFLAG   is set. 
 [ruby-talk:322136]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20670 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog    | 5 +++++
 configure.in | 8 ++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c713d3a78..87567a7aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Dec  7 23:47:37 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (LIBPATHFLAG): use numbered specifier if RPATHFLAG
+	  is set.  [ruby-talk:322136]
+
 Sat Dec  6 17:51:35 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
 
 	* pack.c (pack_pack): 'u0' is not special differently from 'm0'.
diff --git a/configure.in b/configure.in
index 8f7463142..5b38723b2 100644
--- a/configure.in
+++ b/configure.in
@@ -1291,7 +1291,6 @@ AC_SUBST(DLEXT2)dnl
 AC_SUBST(LIBEXT)dnl
 
 STATIC=
-: ${LIBPATHFLAG=' -L%s'}
 : ${PATHFLAG=''}
 
 if test "$with_dln_a_out" != yes; then
@@ -1321,7 +1320,6 @@ if test "$with_dln_a_out" != yes; then
        [  --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 @@ if test "${LDSHAREDXX}" = ""; then
 	    ;;
     esac
 fi
+case ${RPATHFLAG} in
+*'%1$'*)
+    : ${LIBPATHFLAG=' -L%1$-s'};;
+*)
+    : ${LIBPATHFLAG=' -L%s'};;
+esac
 
 AC_SUBST(LINK_SO)
 AC_SUBST(LIBPATHFLAG)
-- 
cgit