* configure.in (LIBPATHFLAG): use numbered specifier if RPATHFLAG

  is set.  [ruby-talk:322136]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@20573 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 14 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 72234c4cc4..778420cc7a 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]
+
 Fri Dec  5 18:13:39 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (rb_w32_isatty): check whether fd is valid.
diff --git a/configure.in b/configure.in
index c97420c4d5..9c552e7fed 100644
--- a/configure.in
+++ b/configure.in
@@ -1146,7 +1146,6 @@ AC_SUBST(DLEXT2)dnl
 AC_SUBST(LIBEXT)dnl
 
 STATIC=
-: ${LIBPATHFLAG=' -L%s'}
 : ${PATHFLAG=''}
 
 if test "$with_dln_a_out" != yes; then
@@ -1176,7 +1175,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
 
@@ -1302,6 +1300,12 @@ if test "$with_dln_a_out" != yes; then
   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)
diff --git a/version.h b/version.h
index b97ca11854..ebf14cfaee 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2008-12-05"
+#define RUBY_RELEASE_DATE "2008-12-07"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20081205
+#define RUBY_RELEASE_CODE 20081207
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 5
+#define RUBY_RELEASE_DAY 7
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];