Hi Gary,
* Gary V. Vaughan wrote on Thu, Nov 17, 2005 at 04:32:43PM CET:
> Ralf Wildenhues wrote:
> >>>What I don't know yet: should lt~obsolete.m4 also be installed in
> >>>$aclocaldir? Can this do any harm perchance?
> >
> >I still need to think about this one (and test).
>
> I originally installed lt~obsolete.m4 to $aclocaldir, and Peter
> noted that things worked perfectly well without it.
With acloal >= 1.8, that should be true I believe.
> I can't think
> of any concrete reason why installing it is bad. Let's do it before
> the alpha so that we'll have a chance to work on any issues that
> arise before 2.0 proper.
OK, let's see. I have applied the patch below to CVS HEAD.
Cheers,
Ralf
* Makefile.am (aclocalfiles): Also install lt~obsolete.m4.
* libtoolize.m4sh (func_check_macros): Updated.
* tests/libtoolize.at: Adjusted.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/Makefile.am,v
retrieving revision 1.179
diff -u -r1.179 Makefile.am
--- Makefile.am 14 Nov 2005 20:39:26 -0000 1.179
+++ Makefile.am 20 Nov 2005 10:02:04 -0000
@@ -270,7 +270,7 @@
# 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:
Index: libtoolize.m4sh
===================================================================
RCS file: /cvsroot/libtool/libtool/libtoolize.m4sh,v
retrieving revision 1.46
diff -u -r1.46 libtoolize.m4sh
--- libtoolize.m4sh 18 Nov 2005 17:37:40 -0000 1.46
+++ libtoolize.m4sh 20 Nov 2005 10:02:04 -0000
@@ -869,7 +869,7 @@
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
Index: tests/libtoolize.at
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/libtoolize.at,v
retrieving revision 1.7
diff -u -r1.7 libtoolize.at
--- tests/libtoolize.at 14 Nov 2005 22:19:40 -0000 1.7
+++ tests/libtoolize.at 20 Nov 2005 10:02:10 -0000
@@ -83,6 +83,7 @@
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/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/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/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/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/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/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/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/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/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/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: 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: 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: 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)
