From: Ralf Wildenhues Date: Sun, 1 Jul 2007 20:55:13 +0000 (+0000) Subject: * libltdl/m4/lt~obsolete.m4 (LTOBSOLETE_VERSION): New macro, to X-Git-Tag: release-2-1b~105 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=35526d6c6431f3bde46751b514584639b60c547c;p=thirdparty%2Flibtool.git * libltdl/m4/lt~obsolete.m4 (LTOBSOLETE_VERSION): New macro, to force-pull in this file by aclocal. * libltdl/m4/libtool.m4 (LT_INIT): Require LTOBSOLETE_VERSION. * tests/libtoolize.at (upgrading verbatim style aclocal.m4): Adjust. Report by H. J. Lu . --- diff --git a/ChangeLog b/ChangeLog index e64424fbd..d3b649864 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2007-07-01 Ralf Wildenhues + * libltdl/m4/lt~obsolete.m4 (LTOBSOLETE_VERSION): New macro, to + force-pull in this file by aclocal. + * libltdl/m4/libtool.m4 (LT_INIT): Require LTOBSOLETE_VERSION. + * tests/libtoolize.at (upgrading verbatim style aclocal.m4): + Adjust. + Report by H. J. Lu . + * libltdl/ltdl.c (tryall_dlopen): Rename argument to have typed alias of `advise' instead of allocating a copy. Fixes memleak. diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4 index 0287d2946..75f1e0e7a 100644 --- a/libltdl/m4/libtool.m4 +++ b/libltdl/m4/libtool.m4 @@ -37,7 +37,7 @@ m4_define([_LT_COPYING], [dnl # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ]) -# serial 53 LT_INIT +# serial 54 LT_INIT # LT_PREREQ(VERSION) @@ -66,6 +66,7 @@ dnl unless we require an AC_DEFUNed macro: AC_REQUIRE([LTOPTIONS_VERSION])dnl AC_REQUIRE([LTSUGAR_VERSION])dnl AC_REQUIRE([LTVERSION_VERSION])dnl +AC_REQUIRE([LTOBSOLETE_VERSION])dnl m4_require([_LT_PROG_LTMAIN])dnl m4_require([_LT_SET_OPTIONS], [_LT_SET_OPTIONS([$1])])dnl diff --git a/libltdl/m4/lt~obsolete.m4 b/libltdl/m4/lt~obsolete.m4 index d4e0a6162..5a4333267 100644 --- a/libltdl/m4/lt~obsolete.m4 +++ b/libltdl/m4/lt~obsolete.m4 @@ -1,13 +1,13 @@ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. # Written by Scott James Remnant, 2004. # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 2 +# serial 3 # These exist entirely to fool aclocal when bootstrapping libtool. # @@ -32,6 +32,9 @@ # we give up compatibility with versions before 1.7, at which point # we need to keep only those names which we still refer to. +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) + m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) diff --git a/tests/libtoolize.at b/tests/libtoolize.at index 8c88c2192..16d67125a 100644 --- a/tests/libtoolize.at +++ b/tests/libtoolize.at @@ -1,6 +1,6 @@ # libtoolize.at -- test libtoolize operation -*- Autotest -*- # -# Copyright (C) 2005 Free Software Foundation, Inc. +# Copyright (C) 2005, 2007 Free Software Foundation, Inc. # Written by Gary V. Vaughan, 2005 # # This file is part of GNU Libtool. @@ -457,7 +457,6 @@ libtoolize: copying file `m4/libtool.m4' libtoolize: `m4/ltsugar.m4' is already up to date. libtoolize: `m4/ltversion.m4' is already up to date. libtoolize: `m4/lt~obsolete.m4' is already up to date. -libtoolize: You should add the contents of `m4/lt~obsolete.m4' to `aclocal.m4'. ]]) AT_DATA([experr], @@ -479,7 +478,6 @@ libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' -libtoolize: You should add the contents of `m4/lt~obsolete.m4' to `aclocal.m4'. ]]) LT_AT_CHECK_LIBTOOLIZE([--copy --force], 0, expout)