configure.in: Backport #1710 [ruby-core:24104]; backport of r20573 to clean up handling of LIBPATHFLAG.

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

3 files changed, 24 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 30dddbc9fc..d465a0c60c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
+Sat Jun 12 07:34:00 Kirk Haines <khaines@ruby-lang.org>
+
+	* configure.in: Backport #1710 [ruby-core:24104]; backport of r20573 to clean up handling of LIBPATHFLAG.
+
 Thu Jun 10 22:50:00 Kirk Haines <khaines@ruby-lang.org>
 
-	* lib/uri/generic.rb: Backport #2428 [ruby-core:27019]; fixed #eql? so that it can handle being passed a nil value.
-	* test/generic/test_generic.rb: added a test for the fix to #eql?.
+	* lib/uri/generic.rb: Backport #2428 [ruby-core:27019]; fixed #eql? so that it can handle being passed a nil value. r28255
+	* test/generic/test_generic.rb: added a test for the fix to #eql?. r28255
 
 Thu Jun 10 06:46:00 Kirk Haines <khaines@ruby-ang.org>
 
diff --git a/configure.in b/configure.in
index c13a09168e..434916fb03 100644
--- a/configure.in
+++ b/configure.in
@@ -1031,7 +1031,6 @@ AC_SUBST(DLEXT2)dnl
 AC_SUBST(LIBEXT)dnl
 
 STATIC=
-: ${LIBPATHFLAG=' -L%s'}
 : ${PATHFLAG=''}
 
 if test "$with_dln_a_out" != yes; then
@@ -1056,6 +1055,14 @@ if test "$with_dln_a_out" != yes; then
     esac
   fi
 
+
+  AC_ARG_ENABLE(rpath,
+       [  --disable-rpath         embed run path into extension libraries.],
+       [enable_rpath=$enableval], [enable_rpath="$rb_cv_binary_elf"])
+  if test "$enable_rpath" = yes; then
+    RPATHFLAG=" ${linker_flag}-R%1\$-s"
+  fi
+
   case "$target_os" in
 	hpux*)		DLDFLAGS="$DLDFLAGS -E"
 			: ${LDSHARED='ld -b'}
@@ -1170,15 +1177,13 @@ if test "$with_dln_a_out" != yes; then
 	*) 		: ${LDSHARED='ld'} ;;
   esac
   AC_MSG_RESULT($rb_cv_dlopen)
-
-  AC_ARG_ENABLE(rpath,
-       [  --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
 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 4f5f35c267..6a6d277a7a 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2010-06-10"
+#define RUBY_RELEASE_DATE "2010-06-12"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20100610
-#define RUBY_PATCHLEVEL 414
+#define RUBY_RELEASE_CODE 20100612
+#define RUBY_PATCHLEVEL 415
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2010
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 10
+#define RUBY_RELEASE_DAY 12
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];