* bin/autoreconf.in (autoreconf_current_directory): Recognize LT_INIT

from the next generation of Libtool.
* lib/autom4te.in (Autoreconf-preselections): Ditto.

diff --git a/ChangeLog b/ChangeLog
index dfff2cab508fb9525a2011f08fd34078060e3daa..b25068434bb72b3712d73c2fbfed426cf8aa2fcd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-02-23  Gary V. Vaughan  <gary@gnu.org>
+
+       * bin/autoreconf.in (autoreconf_current_directory): Recognize LT_INIT
+       from the next generation of Libtool.
+       * lib/autom4te.in (Autoreconf-preselections): Ditto.
+
 2004-02-20  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * doc/autoconf.texi (Limitations of Usual Tools) <mkdir>: `mkdir -p'

diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index bc4d0eaf79cfa211f28ec7007c786b1adfe9bc15..4028a9be1e366475d7b718c3072128717250735b 100644 (file)
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -443,6 +443,7 @@ sub autoreconf_current_directory ()
             'AC_CONFIG_SUBDIRS:AC_CONFIG_SUBDIRS:\$1',
             'AC_INIT',
             'AC_PROG_LIBTOOL',
+            'LT_INIT',
             'AM_GNU_GETTEXT',
            )
      . ' |');
@@ -451,7 +452,7 @@ sub autoreconf_current_directory ()
       $aux_dir = $1                 if /AC_CONFIG_AUX_DIR:(.*)/;
       $uses_autoconf = 1            if /AC_INIT/;
       $uses_gettext_via_traces = 1  if /AM_GNU_GETTEXT/;
-      $uses_libtool = 1             if /AC_PROG_LIBTOOL/;
+      $uses_libtool = 1             if /(AC_PROG_LIBTOOL|LT_INIT)/;
       $uses_autoheader = 1          if /AC_CONFIG_HEADERS/;
       push @subdir, split (' ', $1) if /AC_CONFIG_SUBDIRS:(.*)/;
     }

diff --git a/lib/autom4te.in b/lib/autom4te.in
index e11ea54de1e4b17bf8b03809f7d2ff4ededfb7de..6cf3173d9bf3f54f37ea5a82e0a4fe2989a237dd 100644 (file)
--- a/lib/autom4te.in
+++ b/lib/autom4te.in
@@ -68,6 +68,7 @@ args: --preselect AC_CONFIG_HEADERS
 args: --preselect AC_CONFIG_SUBDIRS
 args: --preselect AC_INIT
 args: --preselect AC_PROG_LIBTOOL
+args: --preselect LT_INIT
 args: --preselect AM_GNU_GETTEXT
 end-language: "Autoreconf-preselections"