* 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 <hjl@lucon.org>.

diff --git a/ChangeLog b/ChangeLog
index e64424fbd18039fdf866a127d7408eb0e5c3a1f0..d3b649864faf653aca8938c7e40cc4b30348b31f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2007-07-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       * 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 <hjl@lucon.org>.
+
        * 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 0287d29467715a942e4619e3500751814c3e0819..75f1e0e7a03352c7e5f1f30e84f2f95a9b094d33 100644 (file)
--- 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 d4e0a616231f5d444701d0766fe10e6f666bbf0e..5a4333267031ce0135b916dc9dba361a2004f61c 100644 (file)
--- 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 8c88c21928b4a7b1b731edaebc451af39d1d9dff..16d67125a4c81b44405f951ff9eb6ef22a2cd5d4 100644 (file)
--- 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)