ruby-changes:27241
From: naruse <ko1@a...>
Date: Sun, 17 Feb 2013 21:46:55 +0900 (JST)
Subject: [ruby-changes:27241] naruse:r39293 (trunk): Revert r39289
naruse 2013-02-17 21:46:45 +0900 (Sun, 17 Feb 2013) New Revision: 39293 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=39293 Log: Revert r39289 * "configure.in: unexpand_shvar" it breaks $LOAD_PATH. Modified files: trunk/ChangeLog trunk/configure.in Index: configure.in =================================================================== --- configure.in (revision 39292) +++ configure.in (revision 39293) @@ -3227,23 +3227,6 @@ shvar_to_cpp() { https://github.com/ruby/ruby/blob/trunk/configure.in#L3227 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, https://github.com/ruby/ruby/blob/trunk/configure.in#L3311 [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='""' Index: ChangeLog =================================================================== --- ChangeLog (revision 39292) +++ ChangeLog (revision 39293) @@ -12,11 +12,6 @@ Sun Feb 17 17:23:22 2013 Nobuyoshi Naka https://github.com/ruby/ruby/blob/trunk/ChangeLog#L12 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@r...> - - * configure.in (unexpand_shvar): regularize a shell variable by - unexpanding shell variables in it. - Sun Feb 17 01:19:00 2013 Zachary Scott <zachary@z...> * ext/psych/lib/psych/y.rb: Document Kernel#y by Adam Stankiewicz -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/