From 43b5cb3dc67ad93871b62f23bee648b1ead01100 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 18 Nov 2008 16:47:50 +0000
Subject: [PATCH] merges r20239 from trunk into ruby_1_9_1 * configure.in
 (LIBRUBYARG_STATIC): fixed for --enable-rpath.

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

diff --git a/ChangeLog b/ChangeLog
index fa036955c1..ee62fc3563 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Nov 17 02:19:03 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (LIBRUBYARG_STATIC): fixed for --enable-rpath.
+
 Sat Nov 15 22:46:32 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* re.c (rb_reg_regsub): returns -1 unless ascii as well as
diff --git a/configure.in b/configure.in
index 3051da2df2..f952e22977 100644
--- a/configure.in
+++ b/configure.in
@@ -1673,9 +1673,9 @@ ENABLE_SHARED=no
 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 @@ if test "$enable_shared" = 'yes'; then
   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"