* lib/autoconf/general.m4 (_AC_INIT_PREPARE): When we escape

single quotes, we only need to search for single quotes; this
both simplifies the search pattern, and makes us less
susceptible to `echo' variations for arguments not containing
single quotes.
(_AC_ARG_VAR_VALIDATE): Likewise.

diff --git a/ChangeLog b/ChangeLog
index f47853b9192e6aed5d0bd324377daf5773241d50..6d20ed646df5b67f13dfbb1b6989662d8d22f07d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-05-06  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * lib/autoconf/general.m4 (_AC_INIT_PREPARE): When we escape
+       single quotes, we only need to search for single quotes; this
+       both simplifies the search pattern, and makes us less
+       susceptible to `echo' variations for arguments not containing
+       single quotes.
+       (_AC_ARG_VAR_VALIDATE): Likewise.
+
 2006-05-04  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * doc/autoconf.texi (Special Shell Variables) <IFS>: Document

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 359ce44223eb105762279e1b3df9a25f34b796b4..4879ce8a6811edb6cca7c3bd4d542c165a0ad5b5 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1156,9 +1156,7 @@ do
     -q | -quiet | --quiet | --quie | --qui | --qu | --q \
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
-dnl If you change this globbing pattern, test it on an old shell --
-dnl it's sensitive.  Putting any kind of quote in it causes syntax errors.
-  [  *" "*|*"  "*|*[\\\[\~\#\$\^\&\*\(\)\{\}\|\;\<\>\?\"\']*|*\]*)]
+    *\'*)
       ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
@@ -1500,10 +1498,7 @@ for ac_var in $ac_precious_vars; do
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-dnl If you change this globbing pattern, test it on an old shell --
-dnl it's sensitive.  Putting any kind of quote in it causes syntax errors.
-[    *" "*|*"  "*|*[\\\[\~\#\$\^\&\*\(\)\{\}\|\;\<\>\?\"\']*|*\]*)]
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in