diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-17 13:16:15 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-17 13:16:15 +0000 |
commit | c503b659ca5e44cdbece8b3cbe5bb3fb941c3bc3 (patch) | |
tree | b099a79626a62aec19cee9e5791232c2da53b469 /configure.in | |
parent | 0a4ca8cfe82fb073aee6b7364315cbacd756446e (diff) |
merge revision(s) 12205:
* configure.in (LIBPATHFLAG, RPATHFLAG): no needs to be quoted,
it is done by libpathflag in mkmf.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17382 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/configure.in b/configure.in index e31a6fec49..849b10ab73 100644 --- a/configure.in +++ b/configure.in @@ -936,7 +936,7 @@ AC_SUBST(DLEXT2)dnl AC_SUBST(LIBEXT)dnl STATIC= -: ${LIBPATHFLAG=' -L"%s"'} +: ${LIBPATHFLAG=' -L%s'} : ${PATHFLAG=''} if test "$with_dln_a_out" != yes; then @@ -1000,7 +1000,7 @@ if test "$with_dln_a_out" != yes; then 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 @@ if test "$with_dln_a_out" != yes; then [ --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 |