[lib/ChangeLog]

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

diff --git a/bootstrap.conf b/bootstrap.conf
index 6124e13..73e7d49 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,6 +1,6 @@
 # Bootstrap configuration.
 
-# Copyright (C) 2006 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2007 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
@@ -19,11 +19,12 @@
 
 
 # We don't need these modules, even though gnulib-tool mistakenly
-# includes them because of gettext dependencies.
+# includes them because of gettext and fchdir dependencies.
 avoided_gnulib_modules='
        --avoid=lock
        --avoid=size_max
        --avoid=xsize
+       --avoid=canonicalize-lgpl
 '
 
 # These modules are obsolete and can probably be removed soon,
@@ -37,26 +38,31 @@ obsolete_gnulib_modules='
 gnulib_modules="
        $avoided_gnulib_modules
        $obsolete_gnulib_modules
-       acl alloca argmatch assert backupfile base64 c-strtod
+       acl alloca announce-gen argmatch assert backupfile base64 c-strtod
        c-strtold calloc canon-host canonicalize chown cloexec
+       config-h configmake
        closeout cycle-check d-ino d-type diacrit dirfd dirname dup2
-       error euidaccess exclude exitfail fcntl-safer fdl file-type
-       fileblocks filemode filenamecat fnmatch-gnu fopen-safer
+       error euidaccess exclude exitfail fchdir fcntl fcntl-safer fdl
+       file-type fileblocks filemode filenamecat fnmatch-gnu fopen-safer
        fprintftime fsusage ftruncate fts getdate getgroups gethrxtime
        getline getloadavg getndelim2 getopt getpagesize getpass-gnu
-       gettext gettime gettimeofday getugroups getusershell
+       gettext gettime gettimeofday getugroups getusershell gnupload
        group-member hard-locale hash hash-pjw host-os human idcache
-       inttostr lchmod lchown lib-ignore linebuffer link-follow
+       inttostr inttypes isapipe
+       lchmod lchown lib-ignore linebuffer link-follow
        long-options lstat malloc mbswidth md5 memcasecmp mempcpy
        memrchr mkancesdirs mkdir mkdir-p mkstemp mktime modechange
        mountlist obstack pathmax perl physmem posixtm posixver putenv
        quote quotearg raise readlink readtokens readtokens0 readutmp
-       realloc regex rmdir rmdir-errno rpmatch safe-read same
-       save-cwd savedir settime sha1 sig2str ssize_t stat-macros
-       stat-time stdbool stdint stdlib-safer stpcpy strcase strftime
-       strpbrk strtoimax strtoumax strverscmp timespec tzset
+       realloc regex rename-dest-slash rmdir rmdir-errno
+       root-dev-ino
+       rpmatch
+       safe-read same
+       save-cwd savedir savewd settime sha1 sig2str ssize_t stat-macros
+       stat-time stdbool stdlib-safer stpcpy strcase strftime
+       strpbrk strtoimax strtoumax strverscmp sys_stat timespec tzset
        unicodeio unistd-safer unlink-busy unlinkdir unlocked-io
-       uptime userspec utimecmp utimens vasprintf version-etc-fsf
+       uptime userspec utimecmp utimens vasprintf verify version-etc-fsf
        wcwidth winsz-ioctl winsz-termios xalloc xgetcwd xgethostname
        xmemcoll xnanosleep xreadlink xstrtod xstrtoimax xstrtol
        xstrtold xstrtoumax yesno
@@ -73,16 +79,11 @@ XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
  --flag=wrapf:1:c-format\\\
 '
 
-# Clean up after getting gnulib and gettext files.
-bootstrap_conf_cleanup() {
-
-  # Gettext supplies these files, but we don't need them since
-  # we don't have an intl subdirectory.
-  files_to_remove='
+# 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/inttypes-h.m4
-    m4/inttypes-pri.m4
     m4/lcmessage.m4
     m4/lock.m4
     m4/printf-posix.m4
@@ -91,7 +92,4 @@ bootstrap_conf_cleanup() {
     m4/ulonglong.m4
     m4/visibility.m4
     m4/xsize.m4
-  '
-  echo $0: rm -f $files_to_remove &&
-  rm -f $files_to_remove
-}
+'