shyouhei	2008-06-17 22:16:15 +0900 (Tue, 17 Jun 2008)

  New Revision: 17382

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/configure.in
    branches/ruby_1_8_5/version.h

  Log:
    merge revision(s) 12205:
    * configure.in (LIBPATHFLAG, RPATHFLAG): no needs to be quoted,
      it is done by libpathflag in mkmf.rb.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/configure.in?r1=17382&r2=17381&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=17382&r2=17381&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=17382&r2=17381&diff_format=u

Index: ruby_1_8_5/configure.in
===================================================================
--- ruby_1_8_5/configure.in	(revision 17381)
+++ ruby_1_8_5/configure.in	(revision 17382)
@@ -936,7 +936,7 @@
 AC_SUBST(LIBEXT)dnl
 
 STATIC=
-: ${LIBPATHFLAG=' -L"%s"'}
+: ${LIBPATHFLAG=' -L%s'}
 : ${PATHFLAG=''}
 
 if test "$with_dln_a_out" != yes; then
@@ -1000,7 +1000,7 @@
 			rb_cv_dlopen=yes ;;
 	interix*) 	: ${LDSHARED="$CC -shared"}
 			XLDFLAGS="$XLDFLAGS -Wl,-E"
-			LIBPATHFLAG=" -L'%1\$-s'"
+			LIBPATHFLAG=" -L%1\$-s"
 			rb_cv_dlopen=yes ;;
 	freebsd*|dragonfly*)       : ${LDSHARED="$CC -shared"}
 			if test "$rb_cv_binary_elf" = yes; then
@@ -1081,11 +1081,11 @@
        [  --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'"
+    LIBPATHFLAG=" -L%1\$-s"
     if test "$GCC" = yes; then
-       RPATHFLAG=" -Wl,-R'%1\$-s'"
+       RPATHFLAG=" -Wl,-R%1\$-s"
     else
-       RPATHFLAG=" -R'%1\$-s'"
+       RPATHFLAG=" -R%1\$-s"
     fi
   fi
 fi
Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 17381)
+++ ruby_1_8_5/ChangeLog	(revision 17382)
@@ -1,3 +1,8 @@
+Tue Jun 17 22:14:41 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (LIBPATHFLAG, RPATHFLAG): no needs to be quoted,
+	  it is done by libpathflag in mkmf.rb.
+
 Mon Jun 16 19:18:35 2008  NAKAMURA Usaku  <usa@r...>
 
 	* lib/mkmf.rb: fixed the bug of handling COMMON_MACROS.
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 17381)
+++ ruby_1_8_5/version.h	(revision 17382)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.5"
-#define RUBY_RELEASE_DATE "2008-06-16"
+#define RUBY_RELEASE_DATE "2008-06-17"
 #define RUBY_VERSION_CODE 185
-#define RUBY_RELEASE_CODE 20080616
-#define RUBY_PATCHLEVEL 223
+#define RUBY_RELEASE_CODE 20080617
+#define RUBY_PATCHLEVEL 224
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 5
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 16
+#define RUBY_RELEASE_DAY 17
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];

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