* bin/autoreconf.in (&parse_args): Don't call automake with

--force-missing unless it actually supports it.
From Debian #219336.

diff --git a/ChangeLog b/ChangeLog
index b64c642de7a0be13bf27aff5696f62932b052043..92f71b0233ac117b3d8504160dbb77ddd5a1a3ba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-11-12  Akim Demaille  <akim@epita.fr>
+
+       * bin/autoreconf.in (&parse_args): Don't call automake with
+       --force-missing unless it actually supports it.
+       From Debian #219336.
+
 2003-11-12  Akim Demaille  <akim@epita.fr>
 
        * configure.ac: Bump to 2.59a.

diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index 2859cff1e5e7068af0d6f33631cb7d69bd032918..53e9601b1f698ac416ae6b371a751286cec06f0b 100644 (file)
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -117,6 +117,8 @@ my $install = 0;
 my $symlink = 0;
 # Does aclocal support --force?
 my $aclocal_supports_force = 0;
+# Does automake support --force-missing?
+my $automake_supports_force_missing = 0;
 
 my @prepend_include;
 my @include;
@@ -172,6 +174,7 @@ sub parse_args ()
     }
 
   $aclocal_supports_force = `$aclocal --help` =~ /--force/;
+  $automake_supports_force_missing = `$automake --help` =~ /--force-missing/;
 
   # Dispatch autoreconf's option to the tools.
   # --include;
@@ -194,7 +197,8 @@ sub parse_args ()
        if $aclocal_supports_force;
       $autoconf   .= ' --force';
       $autoheader .= ' --force';
-      $automake   .= ' --force-missing';
+      $automake   .= ' --force-missing'
+       if $automake_supports_force_missing;
       $autopoint  .= ' --force';
       $libtoolize .= ' --force';
     }