nobu	2012-10-17 15:33:14 +0900 (Wed, 17 Oct 2012)

  New Revision: 37242

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

  Log:
    configure.in: multiple opt-dir
    
    * 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:
    trunk/ChangeLog
    trunk/configure.in

Index: configure.in
===================================================================
--- configure.in	(revision 37241)
+++ configure.in	(revision 37242)
@@ -2293,13 +2293,19 @@
 AC_SUBST(TRY_LINK)
 
 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 -I$withval/include"
-		val=`echo $withval|sed 's/\\//\\\\\\//g'`
-		val=`echo ${LIBPATHFLAG} ${RPATHFLAG}|sed -E 's/%1\\$-s|%s/'${val}'\/lib/g'`
-		LDFLAGS="$LDFLAGS $val"
-		DLDFLAGS="$DLDFLAGS $val"
+		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"
 	])
 
 AS_CASE(["$target_cpu-$target_os"],
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37241)
+++ ChangeLog	(revision 37242)
@@ -1,3 +1,9 @@
+Wed Oct 17 15:33:12 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]
+
 Wed Oct 17 15:08:13 2012  Shugo Maeda  <shugo@r...>
 
 	* lib/net/imap.rb: fix Net::IMAP::ResponseParser to accept

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