usa	2012-10-19 13:31:50 +0900 (Fri, 19 Oct 2012)

  New Revision: 37266

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37266

  Log:
    merge revision(s) 37242: [Backport #7120]
    
    * configure.in (opt-dir): allow multiple directories separated by
      $PATH_SEPARATOR as well as dir_config in mkmf.rb. [ruby-core:47868]
      [Bug #7120]

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

Index: ruby_1_9_3/configure.in
===================================================================
--- ruby_1_9_3/configure.in	(revision 37265)
+++ ruby_1_9_3/configure.in	(revision 37266)
@@ -2945,7 +2945,20 @@
 AC_SUBST(vendorhdrdir)dnl
 
 AC_ARG_WITH(opt-dir,
-	AS_HELP_STRING([--with-opt-dir=DIR], [add optional headers and libraries DIR]))
+	AS_HELP_STRING([--with-opt-dir=DIR-LIST],
+		       [add optional headers and libraries directories separated by $PATH_SEPARATOR]),
+	[
+		CPPFLAGS="$CPPFLAGS `echo \"$PATH_SEPARATOR$withval\" | sed \"s|$PATH_SEPARATOR\([[^$PATH_SEPARATOR]*]\)| -I\1/include|g;s/^ //\"`"
+		set -x
+		val=`IFS="$PATH_SEPARATOR"
+		    for dir in $withval; do
+			echo x ${LIBPATHFLAG} ${RPATHFLAG} |
+			sed -E 's/^x *//;s'"${PATH_SEPARATOR}"'%1\\$-s|%s'"${IFS}${dir}/lib${IFS}g"
+		    done | tr '\012' ' '`
+		set +x
+		LDFLAGS="$LDFLAGS${LDFLAGS:+ }$val"
+		DLDFLAGS="$DLDFLAGS${DLDFLAGS:+ }$val"
+	])
 
 AC_ARG_WITH(mantype,
 	AS_HELP_STRING([--with-mantype=TYPE], [specify man page type; TYPE is one of man and doc]),
Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 37265)
+++ ruby_1_9_3/ChangeLog	(revision 37266)
@@ -1,3 +1,9 @@
+Fri Oct 19 13:28:29 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (opt-dir): allow multiple directories separated by
+	  $PATH_SEPARATOR as well as dir_config in mkmf.rb. [ruby-core:47868]
+	  [Bug #7120]
+
 Tue Oct 16 11:18:06 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/mkmf.rb (dir_config, init_mkmf): use configured libdir value as
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 37265)
+++ ruby_1_9_3/version.h	(revision 37266)
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 296
+#define RUBY_PATCHLEVEL 297
 
-#define RUBY_RELEASE_DATE "2012-10-16"
+#define RUBY_RELEASE_DATE "2012-10-19"
 #define RUBY_RELEASE_YEAR 2012
 #define RUBY_RELEASE_MONTH 10
-#define RUBY_RELEASE_DAY 16
+#define RUBY_RELEASE_DAY 19
 
 #include "ruby/version.h"
 

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