* cfg.mk (gnulib-update): Add autobuild.m4. * configure.ac (AB_INIT): Output autobuild header. * m4/autobuild.m4: New file, from gnulib. * build-aux/config.guess: Resync from upstream. * build-aux/config.sub: Likewise. * build-aux/texinfo.tex: Likewise. * doc/fdl.texi: Likewise. * doc/gnu-oids.texi: Likewise. * doc/make-stds.texi: Likewise. * doc/standards.texi: Likewise. * build-aux/gendocs.sh: Likewise.
Signed-off-by: Eric Blake <[email protected]> --- > > +m4_ifdef([AB_INIT], [AB_INIT]) > > + > Let's go one step further, by installing m4/autobuild.m4 and blindly > calling it (yet another file to sync from gnulib, until such time as > we try to refactor autoconf to use gnulib-tool). I'll work on that > patch. Here we go. Unfortunately, running 'make fetch' undid my local hacks to gendocs.sh, which means 'make web-manual' is now broken again; but I've now posted an upstream patch that's better than my local hacks anyways[1], so hopefully Karl accepts that and I can resync from upstream just prior to releasing 2.68. Any other last-minute patches to include before I start the release process? Right now, it looks like I will have things out the door on Monday. [1]http://lists.gnu.org/archive/html/bug-texinfo/2010-09/msg00007.html I've edited this email to drop the changes to most of the sync'd files. ChangeLog | 13 +++++++++ build-aux/config.guess | 7 +++- build-aux/config.sub | 10 ++++++- build-aux/gendocs.sh | 31 +++++++++------------ build-aux/texinfo.tex | 36 ++++++++++++++++++------ cfg.mk | 1 + configure.ac | 2 + doc/fdl.texi | 20 +++++++------- doc/gnu-oids.texi | 3 ++ doc/make-stds.texi | 11 ++++--- doc/standards.texi | 69 +++++++++++++++++++++++++++++++++++++++++++---- m4/autobuild.m4 | 40 +++++++++++++++++++++++++++ 12 files changed, 193 insertions(+), 50 deletions(-) create mode 100644 m4/autobuild.m4 diff --git a/ChangeLog b/ChangeLog index 8067072..458343f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,18 @@ 2010-09-17 Eric Blake <[email protected]> + build: support autobuild + * cfg.mk (gnulib-update): Add autobuild.m4. + * configure.ac (AB_INIT): Output autobuild header. + * m4/autobuild.m4: New file, from gnulib. + * build-aux/config.guess: Resync from upstream. + * build-aux/config.sub: Likewise. + * build-aux/texinfo.tex: Likewise. + * doc/fdl.texi: Likewise. + * doc/gnu-oids.texi: Likewise. + * doc/make-stds.texi: Likewise. + * doc/standards.texi: Likewise. + * build-aux/gendocs.sh: Likewise. + config.status: avoid corrupting $ac_t * lib/autoconf/status.m4 (_AC_OUTPUT_HEADERS_PREPARE): Use a different name, so as not to clash with pre-2.50 usage of "$ac_t" diff --git a/build-aux/config.guess b/build-aux/config.guess index 115f944..2852378 100755 --- a/build-aux/config.guess +++ b/build-aux/config.guess diff --git a/build-aux/config.sub b/build-aux/config.sub index 204218c..320e303 100755 --- a/build-aux/config.sub +++ b/build-aux/config.sub diff --git a/build-aux/gendocs.sh b/build-aux/gendocs.sh index 7cb2524..e219df3 100755 --- a/build-aux/gendocs.sh +++ b/build-aux/gendocs.sh @@ -282,11 +282,8 @@ fi echo Making .tar.gz for sources... d=`dirname $srcfile` -( -cd "$d" -srcfiles=`ls *.texinfo *.texi *.txi *.eps 2>/dev/null` || true +srcfiles=`ls $d/*.texinfo $d/*.texi $d/*.txi $d/*.eps 2>/dev/null` || true tar cvzfh $outdir/$PACKAGE.texi.tar.gz $srcfiles -) texi_tgz_size=`calcsize $outdir/$PACKAGE.texi.tar.gz` if test -n "$docbook"; then diff --git a/build-aux/texinfo.tex b/build-aux/texinfo.tex index bab1b33..f472b65 100644 --- a/build-aux/texinfo.tex +++ b/build-aux/texinfo.tex diff --git a/cfg.mk b/cfg.mk index 7ba8e04..dc22ea4 100644 --- a/cfg.mk +++ b/cfg.mk @@ -68,6 +68,7 @@ gnulib-update: cp $(gnulib_dir)/doc/gnu-oids.texi $(srcdir)/doc cp $(gnulib_dir)/doc/make-stds.texi $(srcdir)/doc cp $(gnulib_dir)/doc/standards.texi $(srcdir)/doc + cp $(gnulib_dir)/m4/autobuild.m4 $(srcdir)/m4 cp $(gnulib_dir)/top/GNUmakefile $(srcdir) WGET = wget diff --git a/configure.ac b/configure.ac index 5718a24..669b1c8 100644 --- a/configure.ac +++ b/configure.ac @@ -31,6 +31,8 @@ AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([1.11 dist-bzip2 dist-xz readme-alpha no-texinfo.tex std-options]) +AB_INIT + # We use `/bin/sh -n script' to check that there are no syntax errors # in the scripts. Although incredible, there are /bin/sh that go into # endless loops with `-n', e.g., SunOS's: diff --git a/doc/fdl.texi b/doc/fdl.texi index 8805f1a..fc19ddd 100644 --- a/doc/fdl.texi +++ b/doc/fdl.texi diff --git a/doc/gnu-oids.texi b/doc/gnu-oids.texi index da9146c..85386e7 100644 --- a/doc/gnu-oids.texi +++ b/doc/gnu-oids.texi diff --git a/doc/make-stds.texi b/doc/make-stds.texi index 7cc9537..6c83b5d 100644 --- a/doc/make-stds.texi +++ b/doc/make-stds.texi diff --git a/doc/standards.texi b/doc/standards.texi index 4b1c03d..99d76f0 100644 --- a/doc/standards.texi +++ b/doc/standards.texi diff --git a/m4/autobuild.m4 b/m4/autobuild.m4 new file mode 100644 index 0000000..93ccb54 --- /dev/null +++ b/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
