diff options
Diffstat (limited to 'bootstrap.conf')
| -rw-r--r-- | bootstrap.conf | 54 |
1 files changed, 35 insertions, 19 deletions
diff --git a/bootstrap.conf b/bootstrap.conf index 631f2eddf..30433216d 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -38,12 +38,13 @@ obsolete_gnulib_modules=' gnulib_modules=" $avoided_gnulib_modules $obsolete_gnulib_modules - acl alloca announce-gen argmatch assert backupfile base64 c-strtod + acl alloca announce-gen argmatch assert backupfile base64 + c-strcase 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 fchdir fcntl fcntl-safer fdl - file-type fileblocks filemode filenamecat findprog fnmatch-gnu + file-type fileblocks filemode filenamecat fnmatch-gnu fopen-safer fprintftime fsusage ftruncate fts getdate getgroups gethrxtime getline getloadavg getndelim2 getopt getpagesize getpass-gnu @@ -60,13 +61,13 @@ gnulib_modules=" rpmatch safe-read same save-cwd savedir savewd settime sha1 sig2str ssize_t stat-macros - stat-time stdbool stdlib-safer stpcpy strcase strftime + stat-time stdbool stdlib-safer stpcpy strftime strpbrk strtoimax strtoumax strverscmp sys_stat timespec tzset unicodeio unistd-safer unlink-busy unlinkdir unlocked-io 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 + xmemcoll xnanosleep xreadlink xreadlink-with-size xstrtod xstrtoimax + xstrtol xstrtold xstrtoumax yesno " # Other locale categories that need message catalogs. @@ -80,17 +81,32 @@ XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\ --flag=wrapf: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 |