* bin/autoreconf.in (parse_args): Do not pass --no-force to

Automake versions prior to 1.8.

diff --git a/ChangeLog b/ChangeLog
index c01262501d30b460e9def23268f64af7544f622f..d61cc7d42ed4d42b5088308072a72786245222e8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-25  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * bin/autoreconf.in (parse_args): Do not pass --no-force to
+       Automake versions prior to 1.8.
+
 2003-08-25  Akim Demaille  <akim@epita.fr>
 
        * doc/autoconf.texi (Header Portability): netinet/if_ether.h.

diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index 6880cdd39c7bc923219d67bbb1aaf483e05cd5ce..aa0f2e28a52071dee74c15625deab84b4e1dab9c 100644 (file)
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -200,7 +200,12 @@ sub parse_args ()
     }
   else
     {
-      $automake .= ' --no-force';
+      # The implementation of --no-force is bogus in all implementations
+      # of Automake up to 1.8, so we avoid it in these cases.  (Automake
+      # 1.8 is the first version where aclocal supports force, hence
+      # the condition.)
+      $automake .= ' --no-force'
+       if $aclocal_supports_force;
     }
   # --debug;
   if ($debug)