[PATCH] autoreconf: pass '--install' to aclocal as well

[Stefano Lattarini]

When the '-i' option is passed to autoreconf, make it pass the '--install'
option to the aclocal invocation.  This will be especially useful when
Automake will eventually remove support for ACLOCAL_AMFLAGS, so that it
will be no longer possible to specify '--install' there (which was a bad
idea in the first place anyway, see <http://debbugs.gnu.org/9037> for a
rationale).

* bin/autoreconf.in ($aclocal_supports_install): New global variable.
(parse_args): Initialize it properly.  Add the '--install' option to the
aclocal invocation if the '$install' and '$aclocal_supports_install' are
both true.

Signed-off-by: Stefano Lattarini <address@hidden>
---
 bin/autoreconf.in | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index acf25d4..c0ee8d6 100644
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -121,6 +121,8 @@ my $install = 0;
 my $symlink = 0;
 # Does aclocal support --force?
 my $aclocal_supports_force = 0;
+# Does aclocal support --install?
+my $aclocal_supports_install = 0;
 # Does aclocal support -Wfoo?
 my $aclocal_supports_warnings = 0;
 # Does automake support --force-missing?
@@ -188,6 +190,7 @@ sub parse_args ()
   my $aclocal_help = `$aclocal --help 2>/dev/null`;
   my $automake_help = `$automake --help 2>/dev/null`;
   $aclocal_supports_force = $aclocal_help =~ /--force/;
+  $aclocal_supports_install = $aclocal_help =~ /--install/;
   $aclocal_supports_warnings = $aclocal_help =~ /--warnings/;
   $automake_supports_force_missing = $automake_help =~ /--force-missing/;
   $automake_supports_warnings = $automake_help =~ /--warnings/;
@@ -203,6 +206,8 @@ sub parse_args ()
   # --install and --symlink;
   if ($install)
     {
+      $aclocal .= ' --install'
+       if $aclocal_supports_install;
       $automake   .= ' --add-missing';
       $automake   .= ' --copy' unless $symlink;
       $libtoolize .= ' --copy' unless $symlink;
-- 
1.7.12.317.g1c54b74