diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-17 12:46:45 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-17 12:46:45 +0000 |
| commit | c4d41074868afbf18c5a1750eb06617027140598 (patch) | |
| tree | b1e8678cf254f560ffc98ad6b81fb968d870b9b1 | |
| parent | 44c5c2a3120439af7560f9694dcb117953ee3119 (diff) | |
Revert r39289
* "configure.in: unexpand_shvar"
it breaks $LOAD_PATH.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39293 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 21 |
2 files changed, 0 insertions, 26 deletions
@@ -12,11 +12,6 @@ Sun Feb 17 17:23:22 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> win32/Makefile.sub for some reason and moved from there. [ruby-dev:46998] [Bug #7864] -Sun Feb 17 16:57:41 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * configure.in (unexpand_shvar): regularize a shell variable by - unexpanding shell variables in it. - Sun Feb 17 01:19:00 2013 Zachary Scott <zachary@zacharyscott.net> * ext/psych/lib/psych/y.rb: Document Kernel#y by Adam Stankiewicz diff --git a/configure.in b/configure.in index 074e4dc01a..f86e22b5b0 100644 --- a/configure.in +++ b/configure.in @@ -3227,23 +3227,6 @@ shvar_to_cpp() { eval $var='"$val"' } -unexpand_shvar() { - local var=$1 val n v expr quote - shift - test "$#" == 0 && return - quote=['s/${[^${}"]*}/"&"/g'] - for n do - eval v='"$'$n'"' - v="`echo \"$v\" | sed -e \"$quote\" -e ['s/[][$|.\\?*]/\\\\&/g']`" - if test -n "$v"; then - expr=["${expr};s|"'\("[^$"]*\)'"$v|\\1\${$n}\"|g"] - AS_CASE(["$v"], [*'${'*'}'*], [expr=["$expr;s|$v|\"\${$n}\"|g"]]) - fi - done - expr=["${quote}${expr};"'s/"\(\${[^${}"]*}\)"/\1/g'] - eval $var='"`echo \"\\\"${'$var'}\\\"\" | sed \"$expr;s/\\\"\\\"//g;s/^\\\"//;s/\\\"\\\$//\"`"' -} - rubylibprefix='${libdir}/${RUBY_BASE_NAME}' AC_ARG_WITH(rubylibprefix, AS_HELP_STRING([--with-rubylibprefix=DIR], [prefix for ruby libraries [[LIBDIR/RUBY_BASE_NAME]]]), @@ -3328,10 +3311,6 @@ AC_ARG_WITH(vendorarchdir, [vendorarchdir=$withval], [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby/${ruby_version}'}${multiarch-'${vendorlibdir}/${sitearch}'}]) -unexpand_shvar rubylibprefix exec_prefix libdir RUBY_BASE_NAME -unexpand_shvar rubyarchprefix exec_prefix libdir arch RUBY_BASE_NAME archlibdir rubylibprefix -unexpand_shvar rubysitearchprefix exec_prefix libdir sitearch arch RUBY_BASE_NAME archlibdir sitearchlibdir rubylibprefix -unexpand_shvar exec_prefix prefix arch RUBY_BASE_NAME if test "${LOAD_RELATIVE+set}"; then AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE) RUBY_EXEC_PREFIX='""' |