diff options
| -rw-r--r-- | lib/Makefile.am | 6 | ||||
| -rw-r--r-- | m4/gnulib-cache.m4 | 3 | ||||
| -rw-r--r-- | m4/gnulib-comp.m4 | 45 |
3 files changed, 5 insertions, 49 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index b9749062b..666dc0052 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -21,7 +21,7 @@ # the same distribution terms as the rest of that program. # # Generated by gnulib-tool. -# Reproduce by: gnulib-tool --import --local-dir=gnulib-local --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=lock --avoid=unistr/base --avoid=unistr/u8-mbtouc --avoid=unistr/u8-mbtouc-unsafe --avoid=unistr/u8-mbtoucr --avoid=unistr/u8-prev --avoid=unistr/u8-uctomb --avoid=unitypes --lgpl=3 --conditional-dependencies --libtool --macro-prefix=gl --no-vc-files accept alignof alloca-opt announce-gen autobuild bind byteswap c-strcase canonicalize-lgpl ceil clock-time close connect copysign dirfd duplocale environ extensions flock floor fpieee frexp fstat fsync full-read full-write func gendocs getaddrinfo getlogin getpeername getsockname getsockopt git-version-gen gitlog-to-changelog gnu-web-doc-update gnupload havelib iconv_open-utf inet_ntop inet_pton isfinite isinf isnan ldexp lib-symbol-versions lib-symbol-visibility libunistring link listen localcharset locale log1p lstat maintainer-makefile malloc-gnu malloca mkdir mkostemp nl_langinfo nproc open pipe-posix pipe2 poll putenv readlink recv recvfrom regex rename rmdir select send sendto setenv setsockopt shutdown socket stat-time stdlib strftime striconveh string sys_stat time times trunc unistd verify vsnprintf warnings wchar +# Reproduce by: gnulib-tool --import --local-dir=gnulib-local --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=lock --avoid=unistr/base --avoid=unistr/u8-mbtouc --avoid=unistr/u8-mbtouc-unsafe --avoid=unistr/u8-mbtoucr --avoid=unistr/u8-prev --avoid=unistr/u8-uctomb --avoid=unitypes --lgpl=3 --conditional-dependencies --libtool --macro-prefix=gl --no-vc-files accept alignof alloca-opt announce-gen autobuild bind byteswap c-strcase canonicalize-lgpl ceil clock-time close connect copysign dirfd dirname-lgpl duplocale environ extensions flock floor fpieee frexp fstat fsync full-read full-write func gendocs getaddrinfo getlogin getpeername getsockname getsockopt git-version-gen gitlog-to-changelog gnu-web-doc-update gnupload havelib iconv_open-utf inet_ntop inet_pton isfinite isinf isnan ldexp lib-symbol-versions lib-symbol-visibility libunistring link listen localcharset locale log1p lstat maintainer-makefile malloc-gnu malloca mkdir mkostemp nl_langinfo nproc open pipe-posix pipe2 poll putenv readlink recv recvfrom regex rename rmdir select send sendto setenv setsockopt shutdown socket stat-time stdlib strftime striconveh string sys_stat time times trunc unistd verify vsnprintf warnings wchar AUTOMAKE_OPTIONS = 1.9.6 gnits @@ -404,19 +404,15 @@ EXTRA_libgnu_la_SOURCES += dirfd.c ## begin gnulib module dirname-lgpl -if gl_GNULIB_ENABLED_a691da99c1d83b83238e45f41a696f5c libgnu_la_SOURCES += dirname-lgpl.c basename-lgpl.c stripslash.c -endif EXTRA_DIST += dirname.h ## end gnulib module dirname-lgpl ## begin gnulib module dosname -if gl_GNULIB_ENABLED_dosname -endif EXTRA_DIST += dosname.h ## end gnulib module dosname diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4 index 85ba6b683..f6d36c733 100644 --- a/m4/gnulib-cache.m4 +++ b/m4/gnulib-cache.m4 @@ -27,7 +27,7 @@ # Specification in the form of a command-line invocation: -# gnulib-tool --import --local-dir=gnulib-local --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=lock --avoid=unistr/base --avoid=unistr/u8-mbtouc --avoid=unistr/u8-mbtouc-unsafe --avoid=unistr/u8-mbtoucr --avoid=unistr/u8-prev --avoid=unistr/u8-uctomb --avoid=unitypes --lgpl=3 --conditional-dependencies --libtool --macro-prefix=gl --no-vc-files accept alignof alloca-opt announce-gen autobuild bind byteswap c-strcase canonicalize-lgpl ceil clock-time close connect copysign dirfd duplocale environ extensions flock floor fpieee frexp fstat fsync full-read full-write func gendocs getaddrinfo getlogin getpeername getsockname getsockopt git-version-gen gitlog-to-changelog gnu-web-doc-update gnupload havelib iconv_open-utf inet_ntop inet_pton isfinite isinf isnan ldexp lib-symbol-versions lib-symbol-visibility libunistring link listen localcharset locale log1p lstat maintainer-makefile malloc-gnu malloca mkdir mkostemp nl_langinfo nproc open pipe-posix pipe2 poll putenv readlink recv recvfrom regex rename rmdir select send sendto setenv setsockopt shutdown socket stat-time stdlib strftime striconveh string sys_stat time times trunc unistd verify vsnprintf warnings wchar +# gnulib-tool --import --local-dir=gnulib-local --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=lock --avoid=unistr/base --avoid=unistr/u8-mbtouc --avoid=unistr/u8-mbtouc-unsafe --avoid=unistr/u8-mbtoucr --avoid=unistr/u8-prev --avoid=unistr/u8-uctomb --avoid=unitypes --lgpl=3 --conditional-dependencies --libtool --macro-prefix=gl --no-vc-files accept alignof alloca-opt announce-gen autobuild bind byteswap c-strcase canonicalize-lgpl ceil clock-time close connect copysign dirfd dirname-lgpl duplocale environ extensions flock floor fpieee frexp fstat fsync full-read full-write func gendocs getaddrinfo getlogin getpeername getsockname getsockopt git-version-gen gitlog-to-changelog gnu-web-doc-update gnupload havelib iconv_open-utf inet_ntop inet_pton isfinite isinf isnan ldexp lib-symbol-versions lib-symbol-visibility libunistring link listen localcharset locale log1p lstat maintainer-makefile malloc-gnu malloca mkdir mkostemp nl_langinfo nproc open pipe-posix pipe2 poll putenv readlink recv recvfrom regex rename rmdir select send sendto setenv setsockopt shutdown socket stat-time stdlib strftime striconveh string sys_stat time times trunc unistd verify vsnprintf warnings wchar # Specification in the form of a few gnulib-tool.m4 macro invocations: gl_LOCAL_DIR([gnulib-local]) @@ -47,6 +47,7 @@ gl_MODULES([ connect copysign dirfd + dirname-lgpl duplocale environ extensions diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 index 8834cfc17..9881c1b75 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 @@ -310,6 +310,8 @@ AC_DEFUN([gl_INIT], gl_PREREQ_DIRFD fi gl_DIRENT_MODULE_INDICATOR([dirfd]) + gl_DIRNAME_LGPL + gl_DOUBLE_SLASH_ROOT gl_FUNC_DUPLOCALE if test $REPLACE_DUPLOCALE = 1; then AC_LIBOBJ([duplocale]) @@ -705,9 +707,6 @@ AC_DEFUN([gl_INIT], gl_gnulib_enabled_assure=false gl_gnulib_enabled_btowc=false gl_gnulib_enabled_chdir=false - gl_gnulib_enabled_a691da99c1d83b83238e45f41a696f5c=false - gl_gnulib_enabled_dosname=false - gl_gnulib_enabled_36afd6902ac3aacf32e3ff12a686c346=false gl_gnulib_enabled_dup2=false gl_gnulib_enabled_43fe87a341d9b4b93c47c3ad819a5239=false gl_gnulib_enabled_flexmember=false @@ -787,28 +786,6 @@ AC_SUBST([LTALLOCA]) gl_gnulib_enabled_chdir=true fi } - func_gl_gnulib_m4code_a691da99c1d83b83238e45f41a696f5c () - { - if ! $gl_gnulib_enabled_a691da99c1d83b83238e45f41a696f5c; then - gl_DIRNAME_LGPL - gl_gnulib_enabled_a691da99c1d83b83238e45f41a696f5c=true - func_gl_gnulib_m4code_dosname - func_gl_gnulib_m4code_36afd6902ac3aacf32e3ff12a686c346 - fi - } - func_gl_gnulib_m4code_dosname () - { - if ! $gl_gnulib_enabled_dosname; then - gl_gnulib_enabled_dosname=true - fi - } - func_gl_gnulib_m4code_36afd6902ac3aacf32e3ff12a686c346 () - { - if ! $gl_gnulib_enabled_36afd6902ac3aacf32e3ff12a686c346; then - gl_DOUBLE_SLASH_ROOT - gl_gnulib_enabled_36afd6902ac3aacf32e3ff12a686c346=true - fi - } func_gl_gnulib_m4code_dup2 () { if ! $gl_gnulib_enabled_dup2; then @@ -1157,9 +1134,6 @@ AC_SUBST([LTALLOCA]) gl_SYS_STAT_MODULE_INDICATOR([stat]) gl_gnulib_enabled_stat=true if test $REPLACE_STAT = 1; then - func_gl_gnulib_m4code_dosname - fi - if test $REPLACE_STAT = 1; then func_gl_gnulib_m4code_pathmax fi fi @@ -1353,14 +1327,8 @@ AC_SUBST([LTALLOCA]) func_gl_gnulib_m4code_round fi if test $REPLACE_LSTAT = 1; then - func_gl_gnulib_m4code_dosname - fi - if test $REPLACE_LSTAT = 1; then func_gl_gnulib_m4code_stat fi - if test $REPLACE_MKDIR = 1; then - func_gl_gnulib_m4code_a691da99c1d83b83238e45f41a696f5c - fi if test $HAVE_MKOSTEMP = 0; then func_gl_gnulib_m4code_tempname fi @@ -1419,14 +1387,8 @@ AC_SUBST([LTALLOCA]) func_gl_gnulib_m4code_chdir fi if test $REPLACE_RENAME = 1; then - func_gl_gnulib_m4code_a691da99c1d83b83238e45f41a696f5c - fi - if test $REPLACE_RENAME = 1; then func_gl_gnulib_m4code_9bc5f216d57e231e4834049d67d0db62 fi - if test $REPLACE_RMDIR = 1; then - func_gl_gnulib_m4code_dosname - fi if test $REPLACE_SELECT = 1; then func_gl_gnulib_m4code_alloca fi @@ -1486,9 +1448,6 @@ AC_SUBST([LTALLOCA]) AM_CONDITIONAL([gl_GNULIB_ENABLED_assure], [$gl_gnulib_enabled_assure]) AM_CONDITIONAL([gl_GNULIB_ENABLED_btowc], [$gl_gnulib_enabled_btowc]) AM_CONDITIONAL([gl_GNULIB_ENABLED_chdir], [$gl_gnulib_enabled_chdir]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_a691da99c1d83b83238e45f41a696f5c], [$gl_gnulib_enabled_a691da99c1d83b83238e45f41a696f5c]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_dosname], [$gl_gnulib_enabled_dosname]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_36afd6902ac3aacf32e3ff12a686c346], [$gl_gnulib_enabled_36afd6902ac3aacf32e3ff12a686c346]) AM_CONDITIONAL([gl_GNULIB_ENABLED_dup2], [$gl_gnulib_enabled_dup2]) AM_CONDITIONAL([gl_GNULIB_ENABLED_43fe87a341d9b4b93c47c3ad819a5239], [$gl_gnulib_enabled_43fe87a341d9b4b93c47c3ad819a5239]) AM_CONDITIONAL([gl_GNULIB_ENABLED_flexmember], [$gl_gnulib_enabled_flexmember]) |