* lib/autoconf/general.m4: Avoid duplicates in `$ac_configure_args'.

diff --git a/ChangeLog b/ChangeLog
index b0e51c8a9356501ae0d6f196b3abd50ded458775..2ff82344528017707eeb7fb384bcd7a81e9206b4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-12-14  Aaron M. Ucko  <amu@alum.mit.edu>
+
+       * lib/autoconf/general.m4: Avoid duplicates in `$ac_configure_args'.
+
 2001-12-14  Akim Demaille  <akim@epita.fr>
 
        * Makefile.am (MAINTAINERCLEANFILES): Remove configure.

diff --git a/NEWS b/NEWS
index fdf7386db1a1d084a91aa8079550de98541b266b..ea8520d247be232a02663e2172a35959cf5213c0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -61,6 +61,9 @@
 - AC_TRY_RUN
   Under the user pressure, $? is finally available.  Probably a mistake.
 - AC_F77_LIBRARY_LDFLAGS now supports the HP/UX f90 compiler.
+- Precious variables accumulation
+  config.status could stack several copies of the precious variables
+  assignments.
 
 ** C Macros
 

diff --git a/THANKS b/THANKS
index c975b0d93071cd3e0642841725f8b08cd880aa00..0aa1b146bd74adcb5b449e1de25cfc72db3b67b3 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -3,6 +3,7 @@ It would not be what it is today without the invaluable help of these
 people:
 
 Aaron Crane                 aaronc@pobox.com
+Aaron M. Ucko               amu@alum.mit.edu
 Aharon Robbins              arnold@gnu.org
 Akim Demaille               akim@freefriends.org
 Alain Knaff                 Alain.Knaff@imag.fr

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 575e9ac50ae0a5a32da6e8df4f9c45af1778c65e..7145717d1e4fbff1c45d6aa8495aa41fa0277d2a 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1130,17 +1130,19 @@ for ac_arg
 do
   case $ac_arg in
   -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
+  | --no-cr | --no-c) continue ;;
   -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    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"`
-    ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-    ac_sep=" " ;;
-  *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg"
-     ac_sep=" " ;;
+    ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+  esac
+  case " $ac_configure_args " in
+    *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+    *) ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+       ac_sep=" " ;;
   esac
   # Get rid of the leading space.
 done
@@ -1368,18 +1370,18 @@ for ac_var in `(set) 2>&1 |
         ac_cache_corrupted=:
       fi;;
   esac
-  # Pass precious variables to config.status.  It doesn't matter if
-  # we pass some twice (in addition to the command line arguments).
+  # 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_configure_args="$ac_configure_args '$ac_arg'"
-      ;;
-    *) ac_configure_args="$ac_configure_args $ac_var=$ac_new_val"
-       ;;
+      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *) ac_arg=$ac_var=$ac_new_val ;;
+    esac
+    case " $ac_configure_args " in
+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
     esac
   fi
 done