* 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.
This commit is contained in:
Ralf Wildenhues 2006-06-05 12:16:06 +00:00
parent a870fa8da1
commit d6cd3db447
4 changed files with 21 additions and 0 deletions

View File

@ -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

5
NEWS
View File

@ -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.

View File

@ -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;
}

View File

@ -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"