* Makefile.am (aclocalfiles): Also install lt~obsolete.m4.

* libtoolize.m4sh (func_check_macros): Updated.
* tests/libtoolize.at: Adjusted.

diff --git a/ChangeLog b/ChangeLog
index a8285ddd88002166504e7962e1a2d06bf426c227..7a70e4e7b9faf91d7bec451bc12ff58c775d6c44 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-20  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+       * Makefile.am (aclocalfiles): Also install lt~obsolete.m4.
+       * libtoolize.m4sh (func_check_macros): Updated.
+       * tests/libtoolize.at: Adjusted.
+
 2005-11-20  Eric Blake  <ebb9@byu.net>,
            Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 

diff --git a/Makefile.am b/Makefile.am
index 42fb81a712c97fba03d54b6de2f4943cc126f810..e9f2956f5c3af3a3f6124fc9b1ffe165ca5fcb4f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -270,7 +270,7 @@ auxfiles    = $(auxexefiles) config/ltmain.sh
 # Everything that gets picked up by aclocal is automatically distributed,
 # this is the list of macro files we install on the user's system.
 aclocalfiles   = m4/argz.m4 m4/libtool.m4 m4/ltdl.m4 m4/ltoptions.m4 \
-                 m4/ltsugar.m4 m4/ltversion.m4
+                 m4/ltsugar.m4 m4/ltversion.m4 m4/lt~obsolete.m4
 
 ## These are installed as a subdirectory of pkgdatadir so that
 ## libtoolize --ltdl can find them later:

diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index 8643f3f0724dab5987f967901ebc3a741ea88297..4c89f8f38784b3316965db170a478da632372e93 100644 (file)
--- a/libtoolize.m4sh
+++ b/libtoolize.m4sh
@@ -869,7 +869,7 @@ func_check_macros ()
       fi
 
       func_echo "You should add the contents of the following files to \`aclocal.m4':"
-      for need in libtool.m4 ltoptions.m4 ltversion.m4 ltsugar.m4; do
+      for need in libtool.m4 ltoptions.m4 ltversion.m4 ltsugar.m4 lt~obsolete.m4; do
        func_echo "  \`$acmacrodir/$need'"
       done
       if $seen_ltdl || $opt_ltdl; then

diff --git a/tests/libtoolize.at b/tests/libtoolize.at
index 02b2f1116f177ee93fc0822b688415a04f65c04e..c97b394734dfd5ff59b1b4027b72751e433e18c0 100644 (file)
--- a/tests/libtoolize.at
+++ b/tests/libtoolize.at
@@ -83,6 +83,7 @@ libtoolize: copying file `m4/argz.m4'
 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'
 ]])
 
 LT_AT_CHECK_LIBTOOLIZE([--copy], 0, expout)
@@ -111,6 +112,7 @@ libtoolize: copying file `m4/libtool.m4'
 libtoolize: copying file `m4/argz.m4'
 libtoolize: copying file `m4/ltsugar.m4'
 libtoolize: copying file `m4/ltversion.m4'
+libtoolize: copying file `m4/lt~obsolete.m4'
 ]])
 
 AT_DATA(experr,
@@ -132,6 +134,7 @@ libtoolize: `m4/libtool.m4' is already up to date.
 libtoolize: `m4/argz.m4' is already up to date.
 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.
 ]])
 
 AT_DATA(experr,
@@ -155,6 +158,7 @@ libtoolize: copying file `m4/argz.m4'
 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'
 ]])
 
 LT_AT_CHECK_LIBTOOLIZE([--copy --force], 0, expout)
@@ -173,6 +177,7 @@ libtoolize: `m4/argz.m4' is already up to date.
 libtoolize: `m4/ltoptions.m4' is already up to date.
 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.
 ]])
 
 LT_AT_CHECK_LIBTOOLIZE([--copy], 0, expout)
@@ -205,6 +210,7 @@ libtoolize: copying file `m4/libtool.m4'
 libtoolize: copying file `m4/argz.m4'
 libtoolize: copying file `m4/ltsugar.m4'
 libtoolize: copying file `m4/ltversion.m4'
+libtoolize: copying file `m4/lt~obsolete.m4'
 ]])
 
 AT_DATA(experr,
@@ -229,6 +235,7 @@ libtoolize: `m4/libtool.m4' is already up to date.
 libtoolize: `m4/argz.m4' is already up to date.
 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.
 ]])
 
 AT_DATA(experr,
@@ -255,6 +262,7 @@ libtoolize: copying file `m4/argz.m4'
 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'
 ]])
 
 LT_AT_CHECK_LIBTOOLIZE([--copy --force --install], 0, expout)
@@ -276,6 +284,7 @@ libtoolize: `m4/argz.m4' is already up to date.
 libtoolize: `m4/ltoptions.m4' is already up to date.
 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.
 ]])
 
 LT_AT_CHECK_LIBTOOLIZE([--copy --install], 0, expout)
@@ -347,6 +356,7 @@ libtoolize: linking file `ltdl/m4/argz.m4'
 libtoolize: linking file `ltdl/m4/ltoptions.m4'
 libtoolize: linking file `ltdl/m4/ltsugar.m4'
 libtoolize: linking file `ltdl/m4/ltversion.m4'
+libtoolize: linking file `ltdl/m4/lt~obsolete.m4'
 ]])
 
 LT_AT_CHECK_LIBTOOLIZE([--ltdl], 0, expout)
@@ -375,6 +385,7 @@ libtoolize:   \`$tst_aclocaldir/libtool.m4'
 libtoolize:   \`$tst_aclocaldir/ltoptions.m4'
 libtoolize:   \`$tst_aclocaldir/ltversion.m4'
 libtoolize:   \`$tst_aclocaldir/ltsugar.m4'
+libtoolize:   \`$tst_aclocaldir/lt~obsolete.m4'
 EOF]
 
 LT_AT_CHECK_LIBTOOLIZE([--copy], 0, expout)
@@ -417,6 +428,8 @@ libtoolize: copying file `m4/ltsugar.m4'
 libtoolize: You should add the contents of `m4/ltsugar.m4' to `aclocal.m4'.
 libtoolize: copying file `m4/ltversion.m4'
 libtoolize: You should add the contents of `m4/ltversion.m4' to `aclocal.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], 0, expout)
@@ -450,6 +463,8 @@ libtoolize: `m4/argz.m4' is already up to date.
 libtoolize: You should add the contents of `m4/argz.m4' to `aclocal.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],
@@ -472,6 +487,8 @@ libtoolize: You should add the contents of `m4/argz.m4' to `aclocal.m4'.
 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)