merge revision(s) 39636,39741,40454: [Backport #8071] [Backport #8387]

	configure.in: suppress error messages

	* configure.in: suppress error messages, rm: cannot remove
  'conftest.dSYM', from AC_EGREP_CPP with CFLAGS=-g on Darwin.
	* configure.in (rm, shvar_to_cpp, unexpand_shvar): local is not
	  available on old shells.

	* configure.in (shvar_to_cpp): escape quotes for old shells.
	  [Bug #7959] [Bug #8071]

	* configure.in (RUBY_RM_RECURSIVE): this hack is needed by only
	  autoconf 2.69 or earlier on darwin.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40647 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 51 insertions, 32 deletions

diff --git a/configure.in b/configure.in
index 28a70c2ff3..7977aaf359 100644
--- a/configure.in
+++ b/configure.in
@@ -9,6 +9,24 @@ AC_DEFUN([RUBY_PREREQ_AC],
 	[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]), [$1]), [-1],
 		AC_MSG_ERROR([Autoconf version ]$1[ or higher is required]$2))])
 
+AC_DEFUN([RUBY_RM_RECURSIVE], [
+m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]), [2.70]), [-1], [
+# suppress error messages, rm: cannot remove 'conftest.dSYM', from
+# AC_EGREP_CPP with CFLAGS=-g on Darwin.
+AS_CASE([$build_os], [darwin*], [
+rm() {
+    rm_recursive=''
+    for arg do
+	AS_CASE("$arg",
+		[--*], [],
+		[-*r*], [break],
+		[conftest.*], [if test -d "$arg"; then rm_recursive=-r; break; fi],
+		[])
+    done
+    command rm $rm_recursive "[$]@"
+}
+])])])
+
 { # environment section
 
 AC_ARG_WITH(baseruby,
@@ -176,6 +194,7 @@ RUBY_PATCHLEVEL=`sed -n 's/^#define RUBY_PATCHLEVEL //p' $srcdir/version.h`
 AC_DEFINE(CANONICALIZATION_FOR_MATHN)
 dnl checks for alternative programs
 AC_CANONICAL_BUILD
+RUBY_RM_RECURSIVE
 AC_ARG_WITH(gcc,
 	AS_HELP_STRING([--without-gcc], [never use gcc]),
 	[
@@ -3196,44 +3215,44 @@ archincludedir='${includedir}/${arch}'
 sitearchincludedir='${includedir}/${sitearch}'
 
 shvar_to_cpp() {
-    local var="$1" val="$2"
-    local exec_prefix_pat="`echo \"${exec_prefix}\" | sed 's/\\./\\\\./g'`"
-    local arch_pat="`echo \"${arch}\" | sed 's/\\./\\\\./g'`"
-    local sitearch_pat="`echo \"${sitearch}\" | sed 's/\\./\\\\./g'`"
-    val="`echo '"'"${val}"'"' |
+    var="$1" val="$2"
+    exec_prefix_pat="`echo \"${exec_prefix}\" | sed 's/\\./\\\\./g'`"
+    arch_pat="`echo \"${arch}\" | sed 's/\\./\\\\./g'`"
+    sitearch_pat="`echo \"${sitearch}\" | sed 's/\\./\\\\./g'`"
+    val="`echo '\"'\"${val}\"'\"' |
 	sed \
-	    -e 's/\${\([[A-Z][A-Z_]]*\)}/"\1"/g' \
-	    -e 's|\${sitearchlibdir}|'"${sitearchlibdir}|g" \
-	    -e 's|\${sitearchincludedir}|'"${sitearchincludedir}|g" \
-	    -e 's|\${archlibdir}|'"${archlibdir}|g" \
-	    -e 's|\${archincludedir}|'"${archincludedir}|g" \
-	    -e 's|\${libdir}|'"${libdir}|g" \
-	    -e 's/\${ruby_version}/"RUBY_LIB_VERSION"/g' \
-	    -e 's/\${arch}/"arch"/g' \
-	    -e 's/\${sitearch}/"arch"/g' \
-	    -e 's/\${vendorarchdir}/"RUBY_VENDOR_ARCH_LIB"/g' \
-	    -e 's/\${sitearchdir}/"RUBY_SITE_ARCH_LIB"/g' \
-	    -e 's/\${vendorlibdir}/"RUBY_VENDOR_LIB2"/g' \
-	    -e 's/\${sitelibdir}/"RUBY_SITE_LIB2"/g' \
-	    -e 's/\${vendordir}/"RUBY_VENDOR_LIB"/g' \
-	    -e 's/\${sitedir}/"RUBY_SITE_LIB"/g' \
-	    -e 's/\${rubylibdir}/"RUBY_LIB"/g' \
-	    -e 's/\${rubylibprefix}/"RUBY_LIB_PREFIX"/g' \
-	    -e 's/\${rubyarchprefix}/"RUBY_ARCH_PREFIX_FOR(arch)"/g' \
-	    -e 's/\${rubysitearchprefix}/"RUBY_SITEARCH_PREFIX_FOR(arch)"/g' \
-	    -e 's/\${exec_prefix}/"RUBY_EXEC_PREFIX"/g' \
-	    -e "s|${exec_prefix_pat}/|"'"RUBY_EXEC_PREFIX"/|g' \
-	    -e "s|${arch_pat}|"'"arch"|g' \
-	    -e "s|${sitearch_pat}|"'"sitearch"|g' \
-	    -e 's|^\"NONE/|RUBY_EXEC_PREFIX\"/|' \
-	    -e 's|^\"NONE\"|\"'"${prefix}"'\"|' \
-	    -e 's/^\"\"\(.\)/\1/;s/\(.\)\"\"$/\1/'
+	    -e 's/\${\([[A-Z][A-Z_]]*\)}/\"\1\"/g' \
+	    -e 's|\${sitearchlibdir}|'\"${sitearchlibdir}|g\" \
+	    -e 's|\${sitearchincludedir}|'\"${sitearchincludedir}|g\" \
+	    -e 's|\${archlibdir}|'\"${archlibdir}|g\" \
+	    -e 's|\${archincludedir}|'\"${archincludedir}|g\" \
+	    -e 's|\${libdir}|'\"${libdir}|g\" \
+	    -e 's/\${ruby_version}/\"RUBY_LIB_VERSION\"/g' \
+	    -e 's/\${arch}/\"arch\"/g' \
+	    -e 's/\${sitearch}/\"arch\"/g' \
+	    -e 's/\${vendorarchdir}/\"RUBY_VENDOR_ARCH_LIB\"/g' \
+	    -e 's/\${sitearchdir}/\"RUBY_SITE_ARCH_LIB\"/g' \
+	    -e 's/\${vendorlibdir}/\"RUBY_VENDOR_LIB2\"/g' \
+	    -e 's/\${sitelibdir}/\"RUBY_SITE_LIB2\"/g' \
+	    -e 's/\${vendordir}/\"RUBY_VENDOR_LIB\"/g' \
+	    -e 's/\${sitedir}/\"RUBY_SITE_LIB\"/g' \
+	    -e 's/\${rubylibdir}/\"RUBY_LIB\"/g' \
+	    -e 's/\${rubylibprefix}/\"RUBY_LIB_PREFIX\"/g' \
+	    -e 's/\${rubyarchprefix}/\"RUBY_ARCH_PREFIX_FOR(arch)\"/g' \
+	    -e 's/\${rubysitearchprefix}/\"RUBY_SITEARCH_PREFIX_FOR(arch)\"/g' \
+	    -e 's/\${exec_prefix}/\"RUBY_EXEC_PREFIX\"/g' \
+	    -e \"s|${exec_prefix_pat}/|\"'\"RUBY_EXEC_PREFIX\"/|g' \
+	    -e \"s|${arch_pat}|\"'\"arch\"|g' \
+	    -e \"s|${sitearch_pat}|\"'\"sitearch\"|g' \
+	    -e 's|^\\\"NONE/|RUBY_EXEC_PREFIX\\\"/|' \
+	    -e 's|^\\\"NONE\\\"|\\\"'\"${prefix}\"'\\\"|' \
+	    -e 's/^\\\"\\\"\(.\)/\1/;s/\(.\)\\\"\\\"$/\1/'
 	`"
     eval $var='"$val"'
 }
 
 unexpand_shvar() {
-    local var=$1 val n v expr
+    var=$1 n="" v="" expr=""
     shift
     test "$#" -eq 0 && return
     for n do