[PATCH 1/6] * bootstrap.conf: sync from coreutils

[Jim Meyering]

---
 bootstrap.conf |   95 ++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 69 insertions(+), 26 deletions(-)

diff --git a/bootstrap.conf b/bootstrap.conf
index f7bd5e4..e983dc8 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,11 +1,11 @@
 # Bootstrap configuration.

-# Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2006-2009 Free Software Foundation, Inc.

-# This program is free software; you can redistribute it and/or modify
+# 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
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.

 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,19 +16,17 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.


-# We don't need these modules, even though gnulib-tool mistakenly
-# includes them because of gettext and fchdir dependencies.
+# We don't need these modules.
 avoided_gnulib_modules='
-	--avoid=lock
-	--avoid=size_max
-	--avoid=xsize
 	--avoid=canonicalize-lgpl
+	--avoid=dummy
+	--avoid=lock
 '

 # These modules are obsolete and can probably be removed soon,
 # but leave them in for now to minimize changes.
 obsolete_gnulib_modules='
-	atexit free memchr memcmp memcpy memmove memset rename
+	atexit memchr memcmp memcpy memmove memset rename
 	strcspn strtod strtol utime
 '

@@ -43,7 +41,8 @@ gnulib_modules="
 	gettext
 	git-version-gen
         gitlog-to-changelog
-	gnumakefile gnupload
+	gnumakefile
+	gnupload
 	inttypes
 	lib-ignore
 	long-options
@@ -61,26 +60,70 @@ gnulib_modules="
 # Additional xgettext options to use.  Use "\\\newline" to break lines.
 XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
  --from-code=UTF-8\\\
- --flag=asprintf:2:c-format --flag=vasprintf:2:c-format\\\
- --flag=asnprintf:3:c-format --flag=vasnprintf:3:c-format\\\
+ --flag=asprintf:2:c-format\\\
+ --flag=asnprintf:3:c-format\\\
+ --flag=error:3:c-format\\\
+ --flag=error_at_line:5:c-format\\\
+ --flag=vasprintf:2:c-format\\\
+ --flag=vasnprintf:3:c-format\\\
  --flag=wrapf:1:c-format\\\
+ --flag=xasprintf:1:c-format\\\
+ --flag=xfprintf:2:c-format\\\
+ --flag=xprintf: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
+# Append these, since we use the propername module.
+see_manual='"This is a proper name. See the gettext manual, section Names."'
+see_manual=\'"$see_manual"\'
+XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
+ --keyword=proper_name:1,'"$see_manual"'\\\
+ --keyword=proper_name_utf8:1,'"$see_manual"'\\\
 '

+# 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/uintmax_t.m4
+      m4/ulonglong.m4
+      m4/visibility.m4
+  '
+fi
+
+gnulib_tool_option_extras="--tests-base=$bt/gnulib-tests --with-tests"
+
+# Build prerequisites
+buildreq="\
+autoconf   2.61
+automake   1.10a
+autopoint  -
+gettext    -
+git        1.4.4
+gperf      -
+gzip       -
+makeinfo   -
+perl       5.5
+rsync      -
+tar        -
+"
+
 # If there is no ChangeLog file, create it.
 if test -d .git; then
   test -e ChangeLog ||
--
1.6.1.1.347.g3f81d