set envvars via "env" to avoid spurious set -x output from bad shells

[platform/upstream/coreutils.git] / bootstrap.conf

diff --git a/bootstrap.conf b/bootstrap.conf
index d07c23e..5685ad5 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,6 +1,6 @@
 # Bootstrap configuration.
 
-# Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2006-2008 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
@@ -26,7 +26,7 @@ avoided_gnulib_modules='
 # 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
 '
 
@@ -41,7 +41,10 @@ gnulib_modules="
        c-strtold calloc canon-host canonicalize chown cloexec
        config-h configmake
        closein closeout
-       crypto/md5 crypto/sha1
+       crypto/md5
+       crypto/sha1
+       crypto/sha256
+       crypto/sha512
        cycle-check
        d-ino d-type diacrit dirfd dirname dup2
        error euidaccess exclude exitfail fchdir fcntl fcntl-safer fdl
@@ -53,14 +56,23 @@ gnulib_modules="
        ftello
        fts getdate getgroups gethrxtime
        getline getloadavg getndelim2 getopt getpagesize getpass-gnu
-       gettext gettime gettimeofday getugroups getusershell gnupload
+       gettext gettime gettimeofday getugroups getusershell
+       git-version-gen
+       gitlog-to-changelog
+       gnu-make gnumakefile gnupload
        group-member hard-locale hash hash-pjw host-os human idcache
        inttostr inttypes isapipe
        lchmod lchown lib-ignore linebuffer link-follow
        long-options lstat malloc mbswidth memcasecmp mempcpy
        memrchr mgetgroups
        mkancesdirs mkdir mkdir-p mkstemp mktime modechange
-       mountlist mpsort obstack pathmax perl physmem posixtm posixver putenv
+       mountlist mpsort obstack pathmax perl physmem
+       posix-shell
+       posixtm
+       posixver
+       progname
+       propername
+       putenv
        quote quotearg raise readlink areadlink-with-size
        randint
        randperm
@@ -73,16 +85,22 @@ gnulib_modules="
        save-cwd savedir savewd
        selinux-at
        settime sig2str ssize_t stat-macros
-       stat-time stdbool stdlib-safer stpcpy strftime
+       stat-time stdbool stdlib-safer stpcpy
+       stpncpy
+       strftime
        strpbrk strtoimax strtoumax strverscmp sys_stat timespec tzset
        unicodeio unistd-safer unlink-busy unlinkdir unlocked-io
-       uptime userspec utimecmp utimens
+       uptime
+       useless-if-before-free
+       userspec utimecmp utimens
        vasprintf-posix
+       vc-list-files
        verify version-etc-fsf
        wcwidth winsz-ioctl winsz-termios write-any-file
        xalloc xgetcwd xgethostname
        xmemcoll xnanosleep
        xprintf
+       xprintf-posix
        xstrtod xstrtoimax
        xstrtol xstrtold xstrtoumax yesno
 "
@@ -93,9 +111,24 @@ EXTRA_LOCALE_CATEGORIES=LC_TIME
 # 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\\\
+'
+
+# 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]"
@@ -124,3 +157,8 @@ if test $gettext_external = 1; then
       m4/visibility.m4
   '
 fi
+
+gnulib_tool_option_extras="--tests-base=$bt/gnulib-tests --with-tests"
+
+# Automake requires that ChangeLog exist.
+touch ChangeLog