Shipping a copy of autobuild.m4 makes it so that users need not pre-install autobuild just for aclocal to find the macro AB_INIT.
* libltdl/m4/.gitignore: Drop autobuild.m4. * libltdl/m4/autobuild.m4: New file, copied from autobuild. * configure.ac (AB_INIT): Unconditionally call it. Signed-off-by: Eric Blake <ebl...@redhat.com> --- > Be sure to *not* list autobuild.m4 anywhere else, e.g., in Makefile.am. > It is picked up automatically. You can make the AB_INIT call in > configure.ac unconditional, but then again, no loss in leaving it as it > is. I've tested that 'make dist' does include autobuild.m4. ChangeLog | 7 +++++++ configure.ac | 3 +-- libltdl/m4/.gitignore | 1 - libltdl/m4/autobuild.m4 | 40 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 libltdl/m4/autobuild.m4 diff --git a/ChangeLog b/ChangeLog index 8ed47f7..d468552 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-09-20 Eric Blake <ebl...@redhat.com> + + build: ship autobuild.m4, to reduce bootstrap requirement + * libltdl/m4/.gitignore: Drop autobuild.m4. + * libltdl/m4/autobuild.m4: New file, copied from autobuild. + * configure.ac (AB_INIT): Unconditionally call it. + 2010-09-20 Peter Rosin <p...@lysator.liu.se> Ralf Wildenhues <ralf.wildenh...@gmx.de> diff --git a/configure.ac b/configure.ac index 0fcf109..131cd3b 100644 --- a/configure.ac +++ b/configure.ac @@ -138,8 +138,7 @@ AM_INIT_AUTOMAKE([1.11.1 gnu subdir-objects dist-xz color-tests parallel-tests]) # string for this build. : ${autobuild_mode=default} AB_VERSION="AC_PACKAGE_VERSION ($TIMESTAMP)" -m4_ifdef([AB_INIT], - [AB_INIT([$autobuild_mode])]) +AB_INIT([$autobuild_mode]) dnl We use m4sh to generate libtool's portable shell scripts diff --git a/libltdl/m4/.gitignore b/libltdl/m4/.gitignore index 81a1059..0b52c5c 100644 --- a/libltdl/m4/.gitignore +++ b/libltdl/m4/.gitignore @@ -1,2 +1 @@ ltversion.m4 -autobuild.m4 diff --git a/libltdl/m4/autobuild.m4 b/libltdl/m4/autobuild.m4 new file mode 100644 index 0000000..93ccb54 --- /dev/null +++ b/libltdl/m4/autobuild.m4 @@ -0,0 +1,40 @@ +# autobuild.m4 serial 7 +dnl Copyright (C) 2004, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, +dnl Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl From Simon Josefsson + +# Usage: AB_INIT([MODE]). +AC_DEFUN([AB_INIT], +[ + AC_REQUIRE([AC_CANONICAL_BUILD]) + AC_REQUIRE([AC_CANONICAL_HOST]) + + if test -z "$AB_PACKAGE"; then + AB_PACKAGE=${PACKAGE_NAME:-$PACKAGE} + fi + AC_MSG_NOTICE([autobuild project... $AB_PACKAGE]) + + if test -z "$AB_VERSION"; then + AB_VERSION=${PACKAGE_VERSION:-$VERSION} + fi + AC_MSG_NOTICE([autobuild revision... $AB_VERSION]) + + hostname=`hostname` + if test "$hostname"; then + AC_MSG_NOTICE([autobuild hostname... $hostname]) + fi + + ifelse([$1],[],,[AC_MSG_NOTICE([autobuild mode... $1])]) + + date=`TZ=UTC0 date +%Y%m%dT%H%M%SZ` + if test "$?" != 0; then + date=`date` + fi + if test "$date"; then + AC_MSG_NOTICE([autobuild timestamp... $date]) + fi +]) -- 1.7.2.3