Look for AM_PROG_LIBTOOL too

This helps out dh-autoreconf on Debian
<https://bugs.debian.org/759739>.
* bin/autoreconf.in (autoreconf_current_directory):
* lib/autom4te.in (args): Look for AM_PROG_LIBTOOL too.
Copyright-paperwork-exempt: Yes

diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index cceb2358e4e2800f27a892451c83bd1928d75424..12806d3a760c419cf0947bbdc584392c47fefffa 100644 (file)
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -398,6 +398,7 @@ sub autoreconf_current_directory ()
             'AC_CONFIG_SUBDIRS',
             'AC_INIT',
             'AC_PROG_LIBTOOL',
+            'AM_PROG_LIBTOOL',
             'LT_INIT',
             'LT_CONFIG_LTDL_DIR',
             'AM_GNU_GETTEXT',
@@ -412,6 +413,7 @@ sub autoreconf_current_directory ()
       $uses_autoconf = 1            if $macro eq "AC_INIT";
       $uses_gettext_via_traces = 1  if $macro eq "AM_GNU_GETTEXT";
       $uses_libtool = 1             if $macro eq "AC_PROG_LIBTOOL"
+                                       || $macro eq "AM_PROG_LIBTOOL"
                                        || $macro eq "LT_INIT";
       $uses_libltdl = 1             if $macro eq "LT_CONFIG_LTDL_DIR";
       $uses_autoheader = 1          if $macro eq "AC_CONFIG_HEADERS";

diff --git a/lib/autom4te.in b/lib/autom4te.in
index 3a45125aa0e3924ef99c9e793d05bce87416212d..65d42ebd86f0854d575df94cbc95ffea0ee0091a 100644 (file)
--- a/lib/autom4te.in
+++ b/lib/autom4te.in
@@ -98,6 +98,7 @@ args: --preselect AC_CONFIG_MACRO_DIR_TRACE
 args: --preselect AC_CONFIG_SUBDIRS
 args: --preselect AC_INIT
 args: --preselect AC_PROG_LIBTOOL
+args: --preselect AM_PROG_LIBTOOL
 args: --preselect LT_INIT
 args: --preselect LT_CONFIG_LTDL_DIR
 args: --preselect AM_GNU_GETTEXT