diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-10-19 04:31:50 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-10-19 04:31:50 +0000 |
commit | 9b1d07629dd10bba5b70e48ad059543fc9bd60b0 (patch) | |
tree | d0063634db776894d4a3644440489e0f52a5dc60 /configure.in | |
parent | 772640a207589ae7f5397a9019f2e15f1338083d (diff) |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37266 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 1d727e4161..0130e23bb8 100644 --- a/configure.in +++ b/configure.in @@ -2945,7 +2945,20 @@ AC_SUBST(sitehdrdir)dnl 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]), |