build: update build/release infrastructure

* bootstrap: Update from gnulib.
* bootstrap.conf (gnulib-modules): Add do-release-commit-and-tag,
git-version-gen, gnu-make, gnu-web-doc-update, gnumakefile, gnupload,
maintainer-makefile, update-copyright.
* gnulib-tests/Makefile.am: New file.
* cfg.mk: New file.
(local-checks-to-skip): List currently-failing tests,
so that "syntax-check" passes initially.
(manual_title): Define.

1 files changed, 100 insertions, 20 deletions

diff --git a/bootstrap.conf b/bootstrap.conf
index 1e64312..0bb1354 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,6 +1,6 @@
 # Bootstrap configuration.
 
-# Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2006-2009 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,12 +18,50 @@
 
 # gnulib modules used by this package.
 gnulib_modules='
-	c-stack config-h diffseq dirname dup2 error exclude exit exitfail
-	extensions fcntl fdl file-type fnmatch-gnu getopt gettext
-	gettime hard-locale inttostr inttypes mkstemp regex sh-quote
-	stat-macros stat-time strcase strftime strtoumax unistd
-	unlocked-io verify version-etc version-etc-fsf wcwidth xalloc
-	xstrtoumax
+c-stack
+config-h
+diffseq
+dirname
+do-release-commit-and-tag
+dup2
+error
+exclude
+exit
+exitfail
+extensions
+fcntl
+fdl
+file-type
+fnmatch-gnu
+getopt
+gettext
+gettime
+git-version-gen
+gnu-make
+gnu-web-doc-update
+gnumakefile
+gnupload
+hard-locale
+inttostr
+inttypes
+maintainer-makefile
+mkstemp
+regex
+sh-quote
+stat-macros
+stat-time
+strcase
+strftime
+strtoumax
+unistd
+unlocked-io
+update-copyright
+verify
+version-etc
+version-etc-fsf
+wcwidth
+xalloc
+xstrtoumax
 '
 
 # Additional xgettext options to use.  Use "\\\newline" to break lines.
@@ -35,17 +73,59 @@ XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
  --flag=try_help:1:c-format\\\
 '
 
-# Gettext supplies these files, but we don't need them since
-# we don't have an intl subdirectory.
-excluded_files='
-    m4/glibc2.m4
-    m4/intdiv0.m4
-    m4/lcmessage.m4
-    m4/lock.m4
-    m4/printf-posix.m4
-    m4/size_max.m4
-    m4/uintmax_t.m4
-    m4/ulonglong.m4
-    m4/visibility.m4
-    m4/xsize.m4
+# If "AM_GNU_GETTEXT(external" or "AM_GNU_GETTEXT([external]"
+# appears in configure.ac, exclude some unnecessary files.
+# Without grep's -E option (not portable enough, pre-configure),
+# the following test is ugly.  Also, this depends on the existence
+# of configure.ac, not the obsolescent-named configure.in.  But if
+# you're using this infrastructure, you should care about such things.
+
+gettext_external=0
+grep '^[	 ]*AM_GNU_GETTEXT(external\>' configure.ac > /dev/null &&
+  gettext_external=1
+grep '^[	 ]*AM_GNU_GETTEXT(\[external\]' configure.ac > /dev/null &&
+  gettext_external=1
+
+if test $gettext_external = 1; then
+  # Gettext supplies these files, but we don't need them since
+  # we don't have an intl subdirectory.
+  excluded_files='
+      m4/glibc2.m4
+      m4/intdiv0.m4
+      m4/lcmessage.m4
+      m4/lock.m4
+      m4/printf-posix.m4
+      m4/size_max.m4
+      m4/uintmax_t.m4
+      m4/ulonglong.m4
+      m4/visibility.m4
+      m4/xsize.m4
 '
+fi
+
+gnulib_tool_option_extras="--tests-base=$bt/gnulib-tests --with-tests"
+
+# Build prerequisites
+buildreq="\
+autoconf   2.61
+automake   1.11
+autopoint  -
+gettext    -
+git        1.4.4
+gzip       -
+makeinfo   -
+perl       5.5
+rsync      -
+tar        -
+"
+
+# Automake requires that ChangeLog exist.
+touch ChangeLog || exit 1
+
+bootstrap_epilogue()
+{
+  # Change paths in gnulib-tests/gnulib.mk from "../.." to "..".
+  m=gnulib-tests/gnulib.mk
+  sed 's,\.\./\.\.,..,g' $m > $m-t
+  mv -f $m-t $m
+}