Update after gnulib changed.

* autogen.sh (GNULIB_MODULES_RUNTIME_FOR_SRC, GNULIB_MODULES_TOOLS_FOR_SRC,
GNULIB_MODULES_TOOLS_FOR_SRC_COMMON_DEPENDENCIES, GNULIB_MODULES_TOOLS_OTHER,
GNULIB_MODULES_LIBGETTEXTPO): Use the new names of renamed gnulib modules.
* gnulib-local/modules/backupfile (Depends-on): Likewise.
* gnulib-local/modules/closeout (Depends-on): Likewise.
* gnulib-local/modules/libtextstyle-dummy (Depends-on): Likewise.
* gnulib-local/modules/libxml (Depends-on): Likewise.
* libtextstyle/gnulib-local/modules/fd-ostream (Depends-on): Likewise.
* libtextstyle/gnulib-local/modules/html-styled-ostream (Depends-on): Likewise.
* libtextstyle/gnulib-local/modules/iconv-ostream (Depends-on): Likewise.
* libtextstyle/gnulib-local/modules/memory-ostream (Depends-on): Likewise.
* libtextstyle/gnulib-local/modules/noop-styled-ostream (Depends-on): Likewise.
* libtextstyle/gnulib-local/modules/term-ostream (Depends-on): Likewise.

diff --git a/autogen.sh b/autogen.sh
index a5621ad5c3d67237c850f70f57e52c40f1718c63..18449aa33b6cfe68c2748d47c7f05f2f031c24e5 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -98,6 +98,7 @@ if ! $skip_gnulib; then
     attribute
     basename-lgpl
     binary-io
+    bool
     closeout
     error
     getopt-gnu
@@ -110,11 +111,10 @@ if ! $skip_gnulib; then
     relocatable-prog
     setlocale
     sigpipe
-    stdbool
-    stdio
-    stdlib
+    stdio-h
+    stdlib-h
     strtoul
-    unistd
+    unistd-h
     unlocked-io
     xalloc
     xstring-buffer
@@ -172,6 +172,7 @@ if ! $skip_gnulib; then
     binary-io
     bison
     bison-i18n
+    bool
     byteswap
     c-ctype
     c-strcase
@@ -207,7 +208,7 @@ if ! $skip_gnulib; then
     libunistring-optional
     libxml
     localcharset
-    locale
+    locale-h
     localename
     localtime
     lock
@@ -236,9 +237,8 @@ if ! $skip_gnulib; then
     sigpipe
     sigprocmask
     spawn-pipe
-    stdbool
-    stdio
-    stdlib
+    stdio-h
+    stdlib-h
     stpcpy
     stpncpy
     strchrnul
@@ -249,9 +249,9 @@ if ! $skip_gnulib; then
     strtol
     strtoul
     supersede
-    sys_select
-    sys_stat
-    sys_time
+    sys_select-h
+    sys_stat-h
+    sys_time-h
     trim
     unicase/u8-casefold
     unictype/ctype-space
@@ -259,7 +259,7 @@ if ! $skip_gnulib; then
     unilbrk/ulc-width-linebreaks
     uniname/uniname
     uninorm/nfc
-    unistd
+    unistd-h
     unistr/u8-check
     unistr/u8-mbtouc
     unistr/u8-mbtoucr
@@ -287,10 +287,11 @@ if ! $skip_gnulib; then
   # Common dependencies of GNULIB_MODULES_TOOLS_FOR_SRC and GNULIB_MODULES_TOOLS_FOR_LIBGREP.
   GNULIB_MODULES_TOOLS_FOR_SRC_COMMON_DEPENDENCIES='
     alloca-opt
+    bool
     extensions
     gettext-h
     include_next
-    locale
+    locale-h
     localcharset
     malloc-posix
     mbrtowc
@@ -301,14 +302,13 @@ if ! $skip_gnulib; then
     snippet/c++defs
     snippet/warn-on-use
     ssize_t
-    stdbool
-    stddef
-    stdint
-    stdlib
+    stddef-h
+    stdint-h
+    stdlib-h
     streq
-    unistd
+    unistd-h
     verify
-    wchar
+    wchar-h
     wctype-h
     windows-mutex
     windows-once
@@ -324,7 +324,7 @@ if ! $skip_gnulib; then
     javacomp-script
     javaexec-script
     manywarnings
-    stdint
+    stdint-h
   '
   GNULIB_MODULES_TOOLS_LIBUNISTRING_TESTS='
     unilbrk/u8-possible-linebreaks-tests
@@ -351,7 +351,7 @@ if ! $skip_gnulib; then
     `for m in $GNULIB_MODULES_TOOLS_FOR_SRC_COMMON_DEPENDENCIES; do \
        if test \`$GNULIB_TOOL --extract-applicability $m\` != all; then \
          case $m in \
-           locale | stdbool | stddef | stdint | stdlib | unistd | wchar | wctype-h) ;; \
+           bool | locale-h | stddef-h | stdint-h | stdlib-h | unistd-h | wchar-h | wctype-h) ;; \
            *) echo --avoid=$m ;; \
          esac; \
        fi; \
@@ -362,6 +362,7 @@ if ! $skip_gnulib; then
   GNULIB_MODULES_LIBGETTEXTPO='
     attribute
     basename-lgpl
+    bool
     close
     c-ctype
     c-strcase
@@ -385,9 +386,8 @@ if ! $skip_gnulib; then
     open
     relocatable-lib
     sigpipe
-    stdbool
-    stdio
-    stdlib
+    stdio-h
+    stdlib-h
     stpcpy
     stpncpy
     strchrnul

diff --git a/gnulib-local/modules/backupfile b/gnulib-local/modules/backupfile
index f7000788782e00199d96cb209d0c57f6198a6384..bf1e25b0dd39cb0bb2003281c4fad549af857a8a 100644 (file)
--- a/gnulib-local/modules/backupfile
+++ b/gnulib-local/modules/backupfile
@@ -13,7 +13,7 @@ basename-lgpl
 closedir
 opendir
 readdir
-unistd
+unistd-h
 
 configure.ac:
 gt_PREREQ_BACKUPFILE

diff --git a/gnulib-local/modules/closeout b/gnulib-local/modules/closeout
index 5a28ce7da5c644d68840d089218a1faba23077e6..9578005da4c701f4c4ed097ea12740635e1490ee 100644 (file)
--- a/gnulib-local/modules/closeout
+++ b/gnulib-local/modules/closeout
@@ -8,7 +8,7 @@ lib/closeout.c
 Depends-on:
 error
 fwriteerror
-stdlib
+stdlib-h
 gettext-h
 
 configure.ac:

diff --git a/gnulib-local/modules/libtextstyle-dummy b/gnulib-local/modules/libtextstyle-dummy
index 372d3b468d467fb36c3ddd6cfef8c9908a93152a..937ed93a8853776315ff1fca85bb19e1138038c9 100644 (file)
--- a/gnulib-local/modules/libtextstyle-dummy
+++ b/gnulib-local/modules/libtextstyle-dummy
@@ -5,8 +5,8 @@ Files:
 lib/textstyle.in.h
 
 Depends-on:
-stdbool
-unistd
+bool
+unistd-h
 fsync
 
 configure.ac:

diff --git a/gnulib-local/modules/libxml b/gnulib-local/modules/libxml
index dc6404c59362e5d17885a211a61a4eed99da6642..184ce9b040083c01363a8ba6e3798a2e794bc2a3 100644 (file)
--- a/gnulib-local/modules/libxml
+++ b/gnulib-local/modules/libxml
@@ -106,7 +106,7 @@ m4/absolute-header.m4
 
 Depends-on:
 iconv
-stdarg
+stdarg-h
 snprintf
 vsnprintf
 no-c++

diff --git a/libtextstyle/gnulib-local/modules/fd-ostream b/libtextstyle/gnulib-local/modules/fd-ostream
index b0f854c787513c894a066f7f9e7edb0f9672027c..4039c821100c23605a3be81b5f8248b34f318b2c 100644 (file)
--- a/libtextstyle/gnulib-local/modules/fd-ostream
+++ b/libtextstyle/gnulib-local/modules/fd-ostream
@@ -8,7 +8,7 @@ lib/fd-ostream.oo.c
 Depends-on:
 ostream
 error
-stdlib
+stdlib-h
 full-write
 fsync
 gettext

diff --git a/libtextstyle/gnulib-local/modules/html-styled-ostream b/libtextstyle/gnulib-local/modules/html-styled-ostream
index 87dd634b2a7a7f1a93051baaf76e09a0248b27da..2829cdd66ed4d8eaf698ed67e960b7b5edffc6ca 100644 (file)
--- a/libtextstyle/gnulib-local/modules/html-styled-ostream
+++ b/libtextstyle/gnulib-local/modules/html-styled-ostream
@@ -7,12 +7,12 @@ lib/html-styled-ostream.oo.c
 
 Depends-on:
 styled-ostream
-unistd
+unistd-h
 html-ostream
 binary-io
 error
 safe-read
-stdlib
+stdlib-h
 xalloc
 gettext-h
 close

diff --git a/libtextstyle/gnulib-local/modules/iconv-ostream b/libtextstyle/gnulib-local/modules/iconv-ostream
index 6cf1e31dc9a3dd5ce78b63a526955dcfb7e3c124..cedeccbb39a5cddc53861c1b8637fb03906e9efa 100644 (file)
--- a/libtextstyle/gnulib-local/modules/iconv-ostream
+++ b/libtextstyle/gnulib-local/modules/iconv-ostream
@@ -9,7 +9,7 @@ Depends-on:
 ostream
 c-strcase
 error
-stdlib
+stdlib-h
 gettext
 iconv
 xalloc

diff --git a/libtextstyle/gnulib-local/modules/memory-ostream b/libtextstyle/gnulib-local/modules/memory-ostream
index d26a8b296b976780247f6f12107ef0301ee99ce8..fe6e3076d50a1ea655f79fbea808204839d1a6e6 100644 (file)
--- a/libtextstyle/gnulib-local/modules/memory-ostream
+++ b/libtextstyle/gnulib-local/modules/memory-ostream
@@ -8,7 +8,7 @@ lib/memory-ostream.oo.c
 Depends-on:
 ostream
 error
-stdlib
+stdlib-h
 gettext
 xalloc
 xsize

diff --git a/libtextstyle/gnulib-local/modules/noop-styled-ostream b/libtextstyle/gnulib-local/modules/noop-styled-ostream
index d1be7b5ded0ddaaf51c74be5bfd6289c205422f4..2c634d34bb93c2a7c2c6d955768e69a1f209b3e5 100644 (file)
--- a/libtextstyle/gnulib-local/modules/noop-styled-ostream
+++ b/libtextstyle/gnulib-local/modules/noop-styled-ostream
@@ -7,7 +7,7 @@ lib/noop-styled-ostream.oo.c
 
 Depends-on:
 styled-ostream
-stdbool
+bool
 xalloc
 
 configure.ac:

diff --git a/libtextstyle/gnulib-local/modules/term-ostream b/libtextstyle/gnulib-local/modules/term-ostream
index 2c36381cd6fba7b805491d602d5bd21ba404b54a..c68f28136c7968882960f76216c77f99fcb75185 100644 (file)
--- a/libtextstyle/gnulib-local/modules/term-ostream
+++ b/libtextstyle/gnulib-local/modules/term-ostream
@@ -10,14 +10,14 @@ Depends-on:
 ostream
 term-style-control
 error
-stdlib
+stdlib-h
 full-write
 fsync
 gettext-h
 gettimeofday
 get_ppid_of
 get_progname_of
-stdint
+stdint-h
 terminfo-h
 xalloc
 xgethostname