* bin/autoreconf.in: Trace `LT_CONFIG_LTDL_DIR'; if it has been

seen, invoke libtoolize with `--ltdl' argument.
* lib/autom4te.in (Autoreconf-preselections): Adjust.
* NEWS: Update.
Suggested by Eric Blake.

diff --git a/ChangeLog b/ChangeLog
index 3cc2c2556a1dfdddd66b73afe2acbfd37584aa9d..bad3e7a7f90b1510c15d488fa9df806cb10b7a43 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-06-05  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * bin/autoreconf.in: Trace `LT_CONFIG_LTDL_DIR'; if it has been
+       seen, invoke libtoolize with `--ltdl' argument.
+       * lib/autom4te.in (Autoreconf-preselections): Adjust.
+       * NEWS: Update.
+       Suggested by Eric Blake.
+
 2006-06-05  Paul Eggert  <eggert@cs.ucla.edu>
 
        * NEWS: Whoops!  AC_FUNC_STRNLEN isn't obsolescent.  Problem

diff --git a/NEWS b/NEWS
index 7441798e1509e5bd728f7ed72f517f4beda7f71d..f8590e643134a74b78bddbe6090d2f3c4755ddc5 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -53,6 +53,11 @@
   New programs need not use these macros.  We have no current plans to
   remove them.
 
+** autoreconf
+  For compatibility with future Libtool 2.0, autoreconf will invoke
+  libtoolize with the option `--ltdl' now, if LT_CONFIG_LTDL_DIR is
+  used.
+
 * Major changes in Autoconf 2.59c
 
   Released 2006-04-12, by Ralf Wildenhues.

diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index fafb79359d5852d1d2047b7884fa00ade653e665..c224d9396d54182d559b36315e2a300859228d40 100644 (file)
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -442,6 +442,7 @@ sub autoreconf_current_directory ()
   my $aux_dir;
   my $uses_gettext_via_traces;
   my $uses_libtool;
+  my $uses_libltdl;
   my $uses_autoheader;
   my $uses_automake;
   my @subdir;
@@ -457,6 +458,7 @@ sub autoreconf_current_directory ()
             'AC_INIT',
             'AC_PROG_LIBTOOL',
             'LT_INIT',
+            'LT_CONFIG_LTDL_DIR',
             'AM_GNU_GETTEXT',
             'AM_INIT_AUTOMAKE',
            )
@@ -467,6 +469,7 @@ sub autoreconf_current_directory ()
       $uses_autoconf = 1            if /AC_INIT/;
       $uses_gettext_via_traces = 1  if /AM_GNU_GETTEXT/;
       $uses_libtool = 1             if /(AC_PROG_LIBTOOL|LT_INIT)/;
+      $uses_libltdl = 1             if /LT_CONFIG_LTDL_DIR/;
       $uses_autoheader = 1          if /AC_CONFIG_HEADERS/;
       $uses_automake = 1            if /AM_INIT_AUTOMAKE/;
       push @subdir, split (' ', $1) if /AC_CONFIG_SUBDIRS:(.*)/ && $recursive;
@@ -521,6 +524,10 @@ sub autoreconf_current_directory ()
     }
   elsif ($install)
     {
+      if ($uses_libltdl)
+        {
+         $libtoolize .= " --ltdl";
+       }
       xsystem ($libtoolize);
       $rerun_aclocal = 1;
     }

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