* lib/autoconf/general.m4 (_AC_INIT_PREPARE): We cleaning up the

trailing files, don't apply `-rf' to files which might not be
created by configure (core, core.*, and *.core), but just `rm -f'.
Suggested by Jonathan Kamens.

diff --git a/ChangeLog b/ChangeLog
index 2ff82344528017707eeb7fb384bcd7a81e9206b4..23115502064ed11c2c2483d44b7eb4c6ca2fc908 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-12-14  Akim Demaille  <akim@epita.fr>
+
+       * lib/autoconf/general.m4 (_AC_INIT_PREPARE): We cleaning up the
+       trailing files, don't apply `-rf' to files which might not be
+       created by configure (core, core.*, and *.core), but just `rm -f'.
+       Suggested by Jonathan Kamens.
+
 2001-12-14  Aaron M. Ucko  <amu@alum.mit.edu>
 
        * lib/autoconf/general.m4: Avoid duplicates in `$ac_configure_args'.

diff --git a/THANKS b/THANKS
index 0aa1b146bd74adcb5b449e1de25cfc72db3b67b3..a9d83283510aec0e3c170ab35947e9398d9c51d4 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -78,6 +78,7 @@ John David Anglin           dave@hiauly1.hia.nrc.ca
 John Fortin                 fortinj@attglobal.net
 John Interrante             interran@uluru.stanford.edu
 John W. Eaton               jwe@bevo.che.wisc.edu
+Jonathan Kamens             jik@kamens.brookline.ma.us
 J"orn Rennecke              amylaar@cygnus.co.uk
 Joseph S. Myers             jsm28@cam.ac.uk
 Julian Onions               j.onions@nexor.co.uk

diff --git a/configure b/configure
index 89566c7d23978e42589c702bd114d36382a2ea43..dceb2145c9280108041264f8bba132dc9799d286 100755 (executable)
--- a/configure
+++ b/configure
@@ -919,15 +919,17 @@ 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 ;;
   *" "*|*"     "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-    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
@@ -977,7 +979,8 @@ _ASBOX
       echo "$as_me: caught signal $ac_signal"
     echo "$as_me: exit $exit_status"
   } >&5
-  rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files &&
+  rm -f core core.* *.core &&
+  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
      ' 0
 for ac_signal in 1 2 13 15; do
@@ -1055,16 +1058,16 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
         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
     *" "*|*"   "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      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

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 7145717d1e4fbff1c45d6aa8495aa41fa0277d2a..b04bdd46c566203cf50dd6a91801404a2e9f540f 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1173,7 +1173,8 @@ trap 'exit_status=$?
       echo "$as_me: caught signal $ac_signal"
     echo "$as_me: exit $exit_status"
   } >&AS_MESSAGE_LOG_FD
-  rm -rf conftest* confdefs* core core.* *.core conf$[$]* $ac_clean_files &&
+  rm -f core core.* *.core &&
+  rm -rf conftest* confdefs* conf$[$]* $ac_clean_files &&
     exit $exit_status
      ' 0
 for ac_signal in 1 2 13 15; do