libtool-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[FYI] Distribute m4/ltversion.m4


From: Scott James Remnant
Subject: [FYI] Distribute m4/ltversion.m4
Date: Fri, 13 Feb 2004 00:40:00 +0000

The distributed aclocal.m4 contains an m4_include([m4/ltversion.m4])
line.  If the configure script becomes somehow outdated in transit
(through either user modification or timestamp skew) autoconf will be
called and will be unable to find this file because it isn't distributed
and the Makefile that contains the rule to generate it doesn't exist
yet.

We therefore need to distribute this file in our release tarballs.  Keep
distributing ltversion.in as well, as then the user can apply patches
and have their version automatically improved, etc.

Applied to HEAD.

Scott
-- 
Have you ever, ever felt like this?
Had strange things happen?  Are you going round the twist?

diff -ruNp libtool-CVS~/ChangeLog libtool-CVS/ChangeLog
--- libtool-CVS~/ChangeLog      2004-02-12 23:50:56.000000000 +0000
+++ libtool-CVS/ChangeLog       2004-02-13 00:35:23.000000000 +0000
@@ -0,0 +1,6 @@
+2004-02-13  Scott James Remnant  <address@hidden>
+
+       * Makefile.am (pkgmacro_DATA): We have to distribute
+       m4/ltversion.m4 because it can be needed before the Makefile
+       that generates it exists.
+
diff -ruNp libtool-CVS~/Makefile.am libtool-CVS/Makefile.am
--- libtool-CVS~/Makefile.am    2004-02-12 23:49:22.000000000 +0000
+++ libtool-CVS/Makefile.am     2004-02-13 00:31:06.000000000 +0000
@@ -33,12 +33,10 @@ CLEANFILES = libtool libtoolize ltmain.s
 # executable by hand
 dist_pkgdata_DATA = config/config.guess config/config.sub config/ltmain.sh
 
-# We maintain our own macros to provent problems with ancient definitions.
-# lt~obsolete.m4 doesn't belong here, it's for bootstrapping us only
+# Everything that gets picked up by aclocal is automatically distributed,
+# this is the list of macro files we install on the user's system.
 pkgmacrodir = $(pkgdatadir)/m4
-dist_pkgmacro_DATA = m4/libtool.m4 m4/ltdl.m4 m4/ltsugar.m4
-nodist_pkgmacro_DATA = m4/ltversion.m4
-EXTRA_DIST += m4/ltversion.in
+pkgmacro_DATA = m4/libtool.m4 m4/ltdl.m4 m4/ltsugar.m4 m4/ltversion.m4
 
 # We build ltversion.m4 here, instead of from config.status,
 # because config.status is rerun each time one og configure's
@@ -47,6 +45,7 @@ EXTRA_DIST += m4/ltversion.in
 # a loop otherwise.
 # Use `$(top_srcdir)/m4' for the benefit of non-GNU makes: this is
 # how ltversion.m4 appears in our dependencies.
+EXTRA_DIST += m4/ltversion.in
 $(top_srcdir)/m4/ltversion.m4: $(top_srcdir)/m4/ltversion.in stamp-vcl
        set `$(MKSTAMP) < $(top_srcdir)/ChangeLog`; \
        sed -e "s,address@hidden@],$(VERSION),g" \

Attachment: signature.asc
Description: This is a digitally signed message part


reply via email to

[Prev in Thread] Current Thread [Next in Thread]