From: Ralf Wildenhues Date: Sun, 22 Aug 2010 18:33:49 +0000 (+0200) Subject: configure: use Autobuild AB_INIT if available. X-Git-Tag: v2.4~77 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=92d24b3d80c5506db3ff2a2fd0165ac1b96d2bb3;p=thirdparty%2Flibtool.git configure: use Autobuild AB_INIT if available. * configure.ac: Call AB_INIT if it is defined, with $autobuild_mode as argument, to be set at configure time. Set AB_VERSION to the Libtool version string. * HACKING: Update. * libltdl/m4/.gitignore: Ignore autobuild.m4. Signed-off-by: Ralf Wildenhues --- diff --git a/ChangeLog b/ChangeLog index 843f9426e..49940236e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2010-08-22 Ralf Wildenhues + configure: use Autobuild AB_INIT if available. + * configure.ac: Call AB_INIT if it is defined, with + $autobuild_mode as argument, to be set at configure time. + Set AB_VERSION to the Libtool version string. + * HACKING: Update. + Fix getopt tests to skip with Autoconf < 2.61. * tests/getopt-m4sh.at (_LT_AT_GETOPT_M4SH_SETUP): Skip the test if 'autom4te --language=m4sh' exits 63 because version 2.61 is diff --git a/HACKING b/HACKING index 7ea181856..19b4b6665 100644 --- a/HACKING +++ b/HACKING @@ -601,7 +601,9 @@ or obtained by writing to the Free Software Foundation, Inc., (esp. bug-libtool) for outstanding bug reports also in the list of pending moderation requests. -* Make sure you have wget and lzma installed. +* Make sure you have wget, lzma, and autobuild installed. aclocal should be + able to find autobuild.m4; or you can install it into the tree with + aclocal -I libltdl/m4 --install * Make sure your locale is sane, e.g. by exporting LC_ALL=C. @@ -717,8 +719,8 @@ or obtained by writing to the Free Software Foundation, Inc., which will automatically propogate to http://planet.gnu.org. -- - Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, - Inc. + Copyright (C) 2004, 2005, 2006, 2007, 2008, 2010 Free Software + Foundation, Inc. Written by Gary V. Vaughan, 2004 This file is part of GNU Libtool. diff --git a/configure.ac b/configure.ac index 35c79f1e8..9690a0567 100644 --- a/configure.ac +++ b/configure.ac @@ -127,6 +127,19 @@ dnl These are bootstrap requirements! Once built, libtool may work with dnl much older releases of autoconf and automake. See release notes. AM_INIT_AUTOMAKE([1.10.1 gnu subdir-objects dist-lzma]) + +## ------------------------- ## +## Autobuild initialisation. ## +## ------------------------- ## + +# You can set autobuild_mode at configure time to specify a "unique" +# string for this build. +: ${autobuild_mode=default} +AB_VERSION="AC_PACKAGE_VERSION ($TIMESTAMP)" +m4_ifdef([AB_INIT], + [AB_INIT([$autobuild_mode])]) + + dnl We use m4sh to generate libtool's portable shell scripts AC_SUBST([M4SH], ['$(AUTOM4TE) --language=m4sh']) diff --git a/libltdl/m4/.gitignore b/libltdl/m4/.gitignore index 0b52c5cf8..81a10598c 100644 --- a/libltdl/m4/.gitignore +++ b/libltdl/m4/.gitignore @@ -1 +1,2 @@ ltversion.m4 +autobuild.m4