(AC_TRY_CPP): Use "" instead of '' when setting ac_try; we need one level

of expansion there for $ac_cpp, then AC_TRY_EVAL does one more for its the
expansion of $ac_cpp.

diff --git a/acgeneral.m4 b/acgeneral.m4
index 4e6f98ac09a2dd95a59f90eb59bea0439af71037..780a8a4c676fa5ec826ad51325de03505b7a7ed6 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -1447,7 +1447,7 @@ dnl Capture the stderr of cpp.  eval is necessary to expand ac_cpp.
 dnl We used to copy stderr to stdout and capture it in a variable, but
 dnl that breaks under sh -x, which writes compile commands starting
 dnl with ` +' to stderr in eval and subshells.
-ac_try='$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out'
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 AC_TRY_EVAL(ac_try)
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 4e6f98ac09a2dd95a59f90eb59bea0439af71037..780a8a4c676fa5ec826ad51325de03505b7a7ed6 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1447,7 +1447,7 @@ dnl Capture the stderr of cpp.  eval is necessary to expand ac_cpp.
 dnl We used to copy stderr to stdout and capture it in a variable, but
 dnl that breaks under sh -x, which writes compile commands starting
 dnl with ` +' to stderr in eval and subshells.
-ac_try='$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out'
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 AC_TRY_EVAL(ac_try)
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then