texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[6700] replace vasprint-posix gnulib module with vasprintf module


From: Gavin D. Smith
Subject: [6700] replace vasprint-posix gnulib module with vasprintf module
Date: Fri, 16 Oct 2015 17:18:05 +0000

Revision: 6700
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6700
Author:   gavin
Date:     2015-10-16 17:18:03 +0000 (Fri, 16 Oct 2015)
Log Message:
-----------
replace vasprint-posix gnulib module with vasprintf module

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/gnulib/lib/Makefile.am
    trunk/gnulib/m4/gnulib-cache.m4
    trunk/gnulib/m4/gnulib-comp.m4

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-10-16 11:44:07 UTC (rev 6699)
+++ trunk/ChangeLog     2015-10-16 17:18:03 UTC (rev 6700)
@@ -1,5 +1,12 @@
 2015-10-16  Gavin Smith  <address@hidden>
 
+       * Run gnulib-tool at top-level to remove vasprintf-posix module 
+       and use vasprintf instead.  This is intended to reduce the 
+       number of checks done in the configure script, including those 
+       for math.h functions.
+
+2015-10-16  Gavin Smith  <address@hidden>
+
        Get 'make distcheck' to work:
 
        * tp/Texinfo/Convert/XSParagraph/Makefile.am: Remove XSParagraph.c

Modified: trunk/gnulib/lib/Makefile.am
===================================================================
--- trunk/gnulib/lib/Makefile.am        2015-10-16 11:44:07 UTC (rev 6699)
+++ trunk/gnulib/lib/Makefile.am        2015-10-16 17:18:03 UTC (rev 6700)
@@ -21,7 +21,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu 
--source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --tests-base=tests 
--aux-dir=build-aux --no-conditional-dependencies --no-libtool 
--macro-prefix=gl --no-vc-files argz getopt-gnu gettext iconv mbchar mbiter 
mbscasecmp mbschr mbslen mbsncasecmp mbsstr mbswidth memmem memrchr mkstemp 
regex stdarg strcasestr strdup-posix strerror vasprintf-posix xalloc
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu 
--source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --tests-base=tests 
--aux-dir=build-aux --conditional-dependencies --no-libtool --macro-prefix=gl 
--no-vc-files argz getopt-gnu gettext iconv mbchar mbiter mbscasecmp mbschr 
mbslen mbsncasecmp mbsstr mbswidth memmem memrchr mkstemp regex stdarg 
strcasestr strdup-posix strerror vasprintf xalloc
 
 AUTOMAKE_OPTIONS = 1.9.6 gnits subdir-objects
 
@@ -107,7 +107,9 @@
 
 ## begin gnulib module btowc
 
+if gl_GNULIB_ENABLED_btowc
 
+endif
 EXTRA_DIST += btowc.c
 
 EXTRA_libgnu_a_SOURCES += btowc.c
@@ -116,6 +118,7 @@
 
 ## begin gnulib module configmake
 
+if gl_GNULIB_ENABLED_configmake
 # Listed in the same order as the GNU makefile conventions, and
 # provided by autoconf 2.59c+ or 2.70.
 # The Automake-defined pkg* macros are appended, in the order
@@ -157,11 +160,14 @@
 BUILT_SOURCES += configmake.h
 CLEANFILES += configmake.h configmake.h-t
 
+endif
 ## end   gnulib module configmake
 
 ## begin gnulib module dosname
 
+if gl_GNULIB_ENABLED_dosname
 
+endif
 EXTRA_DIST += dosname.h
 
 ## end   gnulib module dosname
@@ -219,6 +225,7 @@
 
 ## begin gnulib module fcntl-h
 
+if gl_GNULIB_ENABLED_deb6c5f14b16306a85c59bccf4d416d8
 BUILT_SOURCES += fcntl.h
 
 # We need the following in order to create <fcntl.h> when the system
@@ -248,6 +255,7 @@
        mv address@hidden $@
 MOSTLYCLEANFILES += fcntl.h fcntl.h-t
 
+endif
 EXTRA_DIST += fcntl.in.h
 
 ## end   gnulib module fcntl-h
@@ -283,31 +291,6 @@
 
 ## end   gnulib module float
 
-## begin gnulib module fpucw
-
-
-EXTRA_DIST += fpucw.h
-
-## end   gnulib module fpucw
-
-## begin gnulib module frexp-nolibm
-
-
-EXTRA_DIST += frexp.c
-
-EXTRA_libgnu_a_SOURCES += frexp.c
-
-## end   gnulib module frexp-nolibm
-
-## begin gnulib module frexpl-nolibm
-
-
-EXTRA_DIST += frexp.c frexpl.c
-
-EXTRA_libgnu_a_SOURCES += frexp.c frexpl.c
-
-## end   gnulib module frexpl-nolibm
-
 ## begin gnulib module getopt-posix
 
 BUILT_SOURCES += $(GETOPT_H)
@@ -360,7 +343,9 @@
 
 ## begin gnulib module gettimeofday
 
+if gl_GNULIB_ENABLED_gettimeofday
 
+endif
 EXTRA_DIST += gettimeofday.c
 
 EXTRA_libgnu_a_SOURCES += gettimeofday.c
@@ -376,38 +361,13 @@
 
 ## begin gnulib module intprops
 
+if gl_GNULIB_ENABLED_intprops
 
+endif
 EXTRA_DIST += intprops.h
 
 ## end   gnulib module intprops
 
-## begin gnulib module isnand-nolibm
-
-
-EXTRA_DIST += float+.h isnan.c isnand-nolibm.h isnand.c
-
-EXTRA_libgnu_a_SOURCES += isnan.c isnand.c
-
-## end   gnulib module isnand-nolibm
-
-## begin gnulib module isnanf-nolibm
-
-
-EXTRA_DIST += float+.h isnan.c isnanf-nolibm.h isnanf.c
-
-EXTRA_libgnu_a_SOURCES += isnan.c isnanf.c
-
-## end   gnulib module isnanf-nolibm
-
-## begin gnulib module isnanl-nolibm
-
-
-EXTRA_DIST += float+.h isnan.c isnanl-nolibm.h isnanl.c
-
-EXTRA_libgnu_a_SOURCES += isnan.c isnanl.c
-
-## end   gnulib module isnanl-nolibm
-
 ## begin gnulib module iswblank
 
 
@@ -419,6 +379,7 @@
 
 ## begin gnulib module langinfo
 
+if gl_GNULIB_ENABLED_langinfo
 BUILT_SOURCES += langinfo.h
 
 # We need the following in order to create an empty placeholder for
@@ -446,12 +407,14 @@
        mv address@hidden $@
 MOSTLYCLEANFILES += langinfo.h langinfo.h-t
 
+endif
 EXTRA_DIST += langinfo.in.h
 
 ## end   gnulib module langinfo
 
 ## begin gnulib module localcharset
 
+if gl_GNULIB_ENABLED_localcharset
 libgnu_a_SOURCES += localcharset.h localcharset.c
 
 # We need the following in order to install a simple file in $(libdir)
@@ -520,12 +483,14 @@
 
 CLEANFILES += charset.alias ref-add.sed ref-del.sed
 
+endif
 EXTRA_DIST += config.charset ref-add.sin ref-del.sin
 
 ## end   gnulib module localcharset
 
 ## begin gnulib module locale
 
+if gl_GNULIB_ENABLED_locale
 BUILT_SOURCES += locale.h
 
 # We need the following in order to create <locale.h> when the system
@@ -555,13 +520,16 @@
        mv address@hidden $@
 MOSTLYCLEANFILES += locale.h locale.h-t
 
+endif
 EXTRA_DIST += locale.in.h
 
 ## end   gnulib module locale
 
 ## begin gnulib module localeconv
 
+if gl_GNULIB_ENABLED_localeconv
 
+endif
 EXTRA_DIST += localeconv.c
 
 EXTRA_libgnu_a_SOURCES += localeconv.c
@@ -570,13 +538,17 @@
 
 ## begin gnulib module lock
 
+if gl_GNULIB_ENABLED_lock
 libgnu_a_SOURCES += glthread/lock.h glthread/lock.c
 
+endif
 ## end   gnulib module lock
 
 ## begin gnulib module lstat
 
+if gl_GNULIB_ENABLED_lstat
 
+endif
 EXTRA_DIST += lstat.c
 
 EXTRA_libgnu_a_SOURCES += lstat.c
@@ -585,7 +557,9 @@
 
 ## begin gnulib module malloc-posix
 
+if gl_GNULIB_ENABLED_ef455225c00f5049c808c2eda3e76866
 
+endif
 EXTRA_DIST += malloc.c
 
 EXTRA_libgnu_a_SOURCES += malloc.c
@@ -600,290 +574,6 @@
 
 ## end   gnulib module malloca
 
-## begin gnulib module math
-
-BUILT_SOURCES += math.h
-libgnu_a_SOURCES += math.c
-
-# We need the following in order to create <math.h> when the system
-# doesn't have one that works with the given compiler.
-math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) 
$(WARN_ON_USE_H)
-       $(AM_V_GEN)rm -f address@hidden $@ && \
-       { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-             -e 
's|@''INCLUDE_NEXT_AS_FIRST_DIRECTIVE''@|$(INCLUDE_NEXT_AS_FIRST_DIRECTIVE)|g' \
-             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-             -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-             -e 
's|@''NEXT_AS_FIRST_DIRECTIVE_MATH_H''@|$(NEXT_AS_FIRST_DIRECTIVE_MATH_H)|g' \
-             -e 's/@''GNULIB_ACOSF''@/$(GNULIB_ACOSF)/g' \
-             -e 's/@''GNULIB_ACOSL''@/$(GNULIB_ACOSL)/g' \
-             -e 's/@''GNULIB_ASINF''@/$(GNULIB_ASINF)/g' \
-             -e 's/@''GNULIB_ASINL''@/$(GNULIB_ASINL)/g' \
-             -e 's/@''GNULIB_ATANF''@/$(GNULIB_ATANF)/g' \
-             -e 's/@''GNULIB_ATANL''@/$(GNULIB_ATANL)/g' \
-             -e 's/@''GNULIB_ATAN2F''@/$(GNULIB_ATAN2F)/g' \
-             -e 's/@''GNULIB_CBRT''@/$(GNULIB_CBRT)/g' \
-             -e 's/@''GNULIB_CBRTF''@/$(GNULIB_CBRTF)/g' \
-             -e 's/@''GNULIB_CBRTL''@/$(GNULIB_CBRTL)/g' \
-             -e 's/@''GNULIB_CEIL''@/$(GNULIB_CEIL)/g' \
-             -e 's/@''GNULIB_CEILF''@/$(GNULIB_CEILF)/g' \
-             -e 's/@''GNULIB_CEILL''@/$(GNULIB_CEILL)/g' \
-             -e 's/@''GNULIB_COPYSIGN''@/$(GNULIB_COPYSIGN)/g' \
-             -e 's/@''GNULIB_COPYSIGNF''@/$(GNULIB_COPYSIGNF)/g' \
-             -e 's/@''GNULIB_COPYSIGNL''@/$(GNULIB_COPYSIGNL)/g' \
-             -e 's/@''GNULIB_COSF''@/$(GNULIB_COSF)/g' \
-             -e 's/@''GNULIB_COSL''@/$(GNULIB_COSL)/g' \
-             -e 's/@''GNULIB_COSHF''@/$(GNULIB_COSHF)/g' \
-             -e 's/@''GNULIB_EXPF''@/$(GNULIB_EXPF)/g' \
-             -e 's/@''GNULIB_EXPL''@/$(GNULIB_EXPL)/g' \
-             -e 's/@''GNULIB_EXP2''@/$(GNULIB_EXP2)/g' \
-             -e 's/@''GNULIB_EXP2F''@/$(GNULIB_EXP2F)/g' \
-             -e 's/@''GNULIB_EXP2L''@/$(GNULIB_EXP2L)/g' \
-             -e 's/@''GNULIB_EXPM1''@/$(GNULIB_EXPM1)/g' \
-             -e 's/@''GNULIB_EXPM1F''@/$(GNULIB_EXPM1F)/g' \
-             -e 's/@''GNULIB_EXPM1L''@/$(GNULIB_EXPM1L)/g' \
-             -e 's/@''GNULIB_FABSF''@/$(GNULIB_FABSF)/g' \
-             -e 's/@''GNULIB_FABSL''@/$(GNULIB_FABSL)/g' \
-             -e 's/@''GNULIB_FLOOR''@/$(GNULIB_FLOOR)/g' \
-             -e 's/@''GNULIB_FLOORF''@/$(GNULIB_FLOORF)/g' \
-             -e 's/@''GNULIB_FLOORL''@/$(GNULIB_FLOORL)/g' \
-             -e 's/@''GNULIB_FMA''@/$(GNULIB_FMA)/g' \
-             -e 's/@''GNULIB_FMAF''@/$(GNULIB_FMAF)/g' \
-             -e 's/@''GNULIB_FMAL''@/$(GNULIB_FMAL)/g' \
-             -e 's/@''GNULIB_FMOD''@/$(GNULIB_FMOD)/g' \
-             -e 's/@''GNULIB_FMODF''@/$(GNULIB_FMODF)/g' \
-             -e 's/@''GNULIB_FMODL''@/$(GNULIB_FMODL)/g' \
-             -e 's/@''GNULIB_FREXPF''@/$(GNULIB_FREXPF)/g' \
-             -e 's/@''GNULIB_FREXP''@/$(GNULIB_FREXP)/g' \
-             -e 's/@''GNULIB_FREXPL''@/$(GNULIB_FREXPL)/g' \
-             -e 's/@''GNULIB_HYPOT''@/$(GNULIB_HYPOT)/g' \
-             -e 's/@''GNULIB_HYPOTF''@/$(GNULIB_HYPOTF)/g' \
-             -e 's/@''GNULIB_HYPOTL''@/$(GNULIB_HYPOTL)/g' \
-             < $(srcdir)/math.in.h | \
-         sed -e 's/@''GNULIB_ILOGB''@/$(GNULIB_ILOGB)/g' \
-             -e 's/@''GNULIB_ILOGBF''@/$(GNULIB_ILOGBF)/g' \
-             -e 's/@''GNULIB_ILOGBL''@/$(GNULIB_ILOGBL)/g' \
-             -e 's/@''GNULIB_ISFINITE''@/$(GNULIB_ISFINITE)/g' \
-             -e 's/@''GNULIB_ISINF''@/$(GNULIB_ISINF)/g' \
-             -e 's/@''GNULIB_ISNAN''@/$(GNULIB_ISNAN)/g' \
-             -e 's/@''GNULIB_ISNANF''@/$(GNULIB_ISNANF)/g' \
-             -e 's/@''GNULIB_ISNAND''@/$(GNULIB_ISNAND)/g' \
-             -e 's/@''GNULIB_ISNANL''@/$(GNULIB_ISNANL)/g' \
-             -e 's/@''GNULIB_LDEXPF''@/$(GNULIB_LDEXPF)/g' \
-             -e 's/@''GNULIB_LDEXPL''@/$(GNULIB_LDEXPL)/g' \
-             -e 's/@''GNULIB_LOG''@/$(GNULIB_LOG)/g' \
-             -e 's/@''GNULIB_LOGF''@/$(GNULIB_LOGF)/g' \
-             -e 's/@''GNULIB_LOGL''@/$(GNULIB_LOGL)/g' \
-             -e 's/@''GNULIB_LOG10''@/$(GNULIB_LOG10)/g' \
-             -e 's/@''GNULIB_LOG10F''@/$(GNULIB_LOG10F)/g' \
-             -e 's/@''GNULIB_LOG10L''@/$(GNULIB_LOG10L)/g' \
-             -e 's/@''GNULIB_LOG1P''@/$(GNULIB_LOG1P)/g' \
-             -e 's/@''GNULIB_LOG1PF''@/$(GNULIB_LOG1PF)/g' \
-             -e 's/@''GNULIB_LOG1PL''@/$(GNULIB_LOG1PL)/g' \
-             -e 's/@''GNULIB_LOG2''@/$(GNULIB_LOG2)/g' \
-             -e 's/@''GNULIB_LOG2F''@/$(GNULIB_LOG2F)/g' \
-             -e 's/@''GNULIB_LOG2L''@/$(GNULIB_LOG2L)/g' \
-             -e 's/@''GNULIB_LOGB''@/$(GNULIB_LOGB)/g' \
-             -e 's/@''GNULIB_LOGBF''@/$(GNULIB_LOGBF)/g' \
-             -e 's/@''GNULIB_LOGBL''@/$(GNULIB_LOGBL)/g' \
-             -e 's/@''GNULIB_MODF''@/$(GNULIB_MODF)/g' \
-             -e 's/@''GNULIB_MODFF''@/$(GNULIB_MODFF)/g' \
-             -e 's/@''GNULIB_MODFL''@/$(GNULIB_MODFL)/g' \
-             -e 's/@''GNULIB_POWF''@/$(GNULIB_POWF)/g' \
-             -e 's/@''GNULIB_REMAINDER''@/$(GNULIB_REMAINDER)/g' \
-             -e 's/@''GNULIB_REMAINDERF''@/$(GNULIB_REMAINDERF)/g' \
-             -e 's/@''GNULIB_REMAINDERL''@/$(GNULIB_REMAINDERL)/g' \
-             -e 's/@''GNULIB_RINT''@/$(GNULIB_RINT)/g' \
-             -e 's/@''GNULIB_RINTF''@/$(GNULIB_RINTF)/g' \
-             -e 's/@''GNULIB_RINTL''@/$(GNULIB_RINTL)/g' \
-             -e 's/@''GNULIB_ROUND''@/$(GNULIB_ROUND)/g' \
-             -e 's/@''GNULIB_ROUNDF''@/$(GNULIB_ROUNDF)/g' \
-             -e 's/@''GNULIB_ROUNDL''@/$(GNULIB_ROUNDL)/g' \
-             -e 's/@''GNULIB_SIGNBIT''@/$(GNULIB_SIGNBIT)/g' \
-             -e 's/@''GNULIB_SINF''@/$(GNULIB_SINF)/g' \
-             -e 's/@''GNULIB_SINL''@/$(GNULIB_SINL)/g' \
-             -e 's/@''GNULIB_SINHF''@/$(GNULIB_SINHF)/g' \
-             -e 's/@''GNULIB_SQRTF''@/$(GNULIB_SQRTF)/g' \
-             -e 's/@''GNULIB_SQRTL''@/$(GNULIB_SQRTL)/g' \
-             -e 's/@''GNULIB_TANF''@/$(GNULIB_TANF)/g' \
-             -e 's/@''GNULIB_TANL''@/$(GNULIB_TANL)/g' \
-             -e 's/@''GNULIB_TANHF''@/$(GNULIB_TANHF)/g' \
-             -e 's/@''GNULIB_TRUNC''@/$(GNULIB_TRUNC)/g' \
-             -e 's/@''GNULIB_TRUNCF''@/$(GNULIB_TRUNCF)/g' \
-             -e 's/@''GNULIB_TRUNCL''@/$(GNULIB_TRUNCL)/g' \
-         | \
-         sed -e 's|@''HAVE_ACOSF''@|$(HAVE_ACOSF)|g' \
-             -e 's|@''HAVE_ACOSL''@|$(HAVE_ACOSL)|g' \
-             -e 's|@''HAVE_ASINF''@|$(HAVE_ASINF)|g' \
-             -e 's|@''HAVE_ASINL''@|$(HAVE_ASINL)|g' \
-             -e 's|@''HAVE_ATANF''@|$(HAVE_ATANF)|g' \
-             -e 's|@''HAVE_ATANL''@|$(HAVE_ATANL)|g' \
-             -e 's|@''HAVE_ATAN2F''@|$(HAVE_ATAN2F)|g' \
-             -e 's|@''HAVE_CBRT''@|$(HAVE_CBRT)|g' \
-             -e 's|@''HAVE_CBRTF''@|$(HAVE_CBRTF)|g' \
-             -e 's|@''HAVE_CBRTL''@|$(HAVE_CBRTL)|g' \
-             -e 's|@''HAVE_COPYSIGN''@|$(HAVE_COPYSIGN)|g' \
-             -e 's|@''HAVE_COPYSIGNL''@|$(HAVE_COPYSIGNL)|g' \
-             -e 's|@''HAVE_COSF''@|$(HAVE_COSF)|g' \
-             -e 's|@''HAVE_COSL''@|$(HAVE_COSL)|g' \
-             -e 's|@''HAVE_COSHF''@|$(HAVE_COSHF)|g' \
-             -e 's|@''HAVE_EXPF''@|$(HAVE_EXPF)|g' \
-             -e 's|@''HAVE_EXPL''@|$(HAVE_EXPL)|g' \
-             -e 's|@''HAVE_EXPM1''@|$(HAVE_EXPM1)|g' \
-             -e 's|@''HAVE_EXPM1F''@|$(HAVE_EXPM1F)|g' \
-             -e 's|@''HAVE_FABSF''@|$(HAVE_FABSF)|g' \
-             -e 's|@''HAVE_FABSL''@|$(HAVE_FABSL)|g' \
-             -e 's|@''HAVE_FMA''@|$(HAVE_FMA)|g' \
-             -e 's|@''HAVE_FMAF''@|$(HAVE_FMAF)|g' \
-             -e 's|@''HAVE_FMAL''@|$(HAVE_FMAL)|g' \
-             -e 's|@''HAVE_FMODF''@|$(HAVE_FMODF)|g' \
-             -e 's|@''HAVE_FMODL''@|$(HAVE_FMODL)|g' \
-             -e 's|@''HAVE_FREXPF''@|$(HAVE_FREXPF)|g' \
-             -e 's|@''HAVE_HYPOTF''@|$(HAVE_HYPOTF)|g' \
-             -e 's|@''HAVE_HYPOTL''@|$(HAVE_HYPOTL)|g' \
-             -e 's|@''HAVE_ILOGB''@|$(HAVE_ILOGB)|g' \
-             -e 's|@''HAVE_ILOGBF''@|$(HAVE_ILOGBF)|g' \
-             -e 's|@''HAVE_ILOGBL''@|$(HAVE_ILOGBL)|g' \
-             -e 's|@''HAVE_ISNANF''@|$(HAVE_ISNANF)|g' \
-             -e 's|@''HAVE_ISNAND''@|$(HAVE_ISNAND)|g' \
-             -e 's|@''HAVE_ISNANL''@|$(HAVE_ISNANL)|g' \
-             -e 's|@''HAVE_LDEXPF''@|$(HAVE_LDEXPF)|g' \
-             -e 's|@''HAVE_LOGF''@|$(HAVE_LOGF)|g' \
-             -e 's|@''HAVE_LOGL''@|$(HAVE_LOGL)|g' \
-             -e 's|@''HAVE_LOG10F''@|$(HAVE_LOG10F)|g' \
-             -e 's|@''HAVE_LOG10L''@|$(HAVE_LOG10L)|g' \
-             -e 's|@''HAVE_LOG1P''@|$(HAVE_LOG1P)|g' \
-             -e 's|@''HAVE_LOG1PF''@|$(HAVE_LOG1PF)|g' \
-             -e 's|@''HAVE_LOG1PL''@|$(HAVE_LOG1PL)|g' \
-             -e 's|@''HAVE_LOGBF''@|$(HAVE_LOGBF)|g' \
-             -e 's|@''HAVE_LOGBL''@|$(HAVE_LOGBL)|g' \
-             -e 's|@''HAVE_MODFF''@|$(HAVE_MODFF)|g' \
-             -e 's|@''HAVE_MODFL''@|$(HAVE_MODFL)|g' \
-             -e 's|@''HAVE_POWF''@|$(HAVE_POWF)|g' \
-             -e 's|@''HAVE_REMAINDER''@|$(HAVE_REMAINDER)|g' \
-             -e 's|@''HAVE_REMAINDERF''@|$(HAVE_REMAINDERF)|g' \
-             -e 's|@''HAVE_RINT''@|$(HAVE_RINT)|g' \
-             -e 's|@''HAVE_RINTL''@|$(HAVE_RINTL)|g' \
-             -e 's|@''HAVE_SINF''@|$(HAVE_SINF)|g' \
-             -e 's|@''HAVE_SINL''@|$(HAVE_SINL)|g' \
-             -e 's|@''HAVE_SINHF''@|$(HAVE_SINHF)|g' \
-             -e 's|@''HAVE_SQRTF''@|$(HAVE_SQRTF)|g' \
-             -e 's|@''HAVE_SQRTL''@|$(HAVE_SQRTL)|g' \
-             -e 's|@''HAVE_TANF''@|$(HAVE_TANF)|g' \
-             -e 's|@''HAVE_TANL''@|$(HAVE_TANL)|g' \
-             -e 's|@''HAVE_TANHF''@|$(HAVE_TANHF)|g' \
-             -e 's|@''HAVE_DECL_ACOSL''@|$(HAVE_DECL_ACOSL)|g' \
-             -e 's|@''HAVE_DECL_ASINL''@|$(HAVE_DECL_ASINL)|g' \
-             -e 's|@''HAVE_DECL_ATANL''@|$(HAVE_DECL_ATANL)|g' \
-             -e 's|@''HAVE_DECL_CBRTF''@|$(HAVE_DECL_CBRTF)|g' \
-             -e 's|@''HAVE_DECL_CBRTL''@|$(HAVE_DECL_CBRTL)|g' \
-             -e 's|@''HAVE_DECL_CEILF''@|$(HAVE_DECL_CEILF)|g' \
-             -e 's|@''HAVE_DECL_CEILL''@|$(HAVE_DECL_CEILL)|g' \
-             -e 's|@''HAVE_DECL_COPYSIGNF''@|$(HAVE_DECL_COPYSIGNF)|g' \
-             -e 's|@''HAVE_DECL_COSL''@|$(HAVE_DECL_COSL)|g' \
-             -e 's|@''HAVE_DECL_EXPL''@|$(HAVE_DECL_EXPL)|g' \
-             -e 's|@''HAVE_DECL_EXP2''@|$(HAVE_DECL_EXP2)|g' \
-             -e 's|@''HAVE_DECL_EXP2F''@|$(HAVE_DECL_EXP2F)|g' \
-             -e 's|@''HAVE_DECL_EXP2L''@|$(HAVE_DECL_EXP2L)|g' \
-             -e 's|@''HAVE_DECL_EXPM1L''@|$(HAVE_DECL_EXPM1L)|g' \
-             -e 's|@''HAVE_DECL_FLOORF''@|$(HAVE_DECL_FLOORF)|g' \
-             -e 's|@''HAVE_DECL_FLOORL''@|$(HAVE_DECL_FLOORL)|g' \
-             -e 's|@''HAVE_DECL_FREXPL''@|$(HAVE_DECL_FREXPL)|g' \
-             -e 's|@''HAVE_DECL_LDEXPL''@|$(HAVE_DECL_LDEXPL)|g' \
-             -e 's|@''HAVE_DECL_LOGL''@|$(HAVE_DECL_LOGL)|g' \
-             -e 's|@''HAVE_DECL_LOG10L''@|$(HAVE_DECL_LOG10L)|g' \
-             -e 's|@''HAVE_DECL_LOG2''@|$(HAVE_DECL_LOG2)|g' \
-             -e 's|@''HAVE_DECL_LOG2F''@|$(HAVE_DECL_LOG2F)|g' \
-             -e 's|@''HAVE_DECL_LOG2L''@|$(HAVE_DECL_LOG2L)|g' \
-             -e 's|@''HAVE_DECL_LOGB''@|$(HAVE_DECL_LOGB)|g' \
-             -e 's|@''HAVE_DECL_REMAINDER''@|$(HAVE_DECL_REMAINDER)|g' \
-             -e 's|@''HAVE_DECL_REMAINDERL''@|$(HAVE_DECL_REMAINDERL)|g' \
-             -e 's|@''HAVE_DECL_RINTF''@|$(HAVE_DECL_RINTF)|g' \
-             -e 's|@''HAVE_DECL_ROUND''@|$(HAVE_DECL_ROUND)|g' \
-             -e 's|@''HAVE_DECL_ROUNDF''@|$(HAVE_DECL_ROUNDF)|g' \
-             -e 's|@''HAVE_DECL_ROUNDL''@|$(HAVE_DECL_ROUNDL)|g' \
-             -e 's|@''HAVE_DECL_SINL''@|$(HAVE_DECL_SINL)|g' \
-             -e 's|@''HAVE_DECL_SQRTL''@|$(HAVE_DECL_SQRTL)|g' \
-             -e 's|@''HAVE_DECL_TANL''@|$(HAVE_DECL_TANL)|g' \
-             -e 's|@''HAVE_DECL_TRUNC''@|$(HAVE_DECL_TRUNC)|g' \
-             -e 's|@''HAVE_DECL_TRUNCF''@|$(HAVE_DECL_TRUNCF)|g' \
-             -e 's|@''HAVE_DECL_TRUNCL''@|$(HAVE_DECL_TRUNCL)|g' \
-         | \
-         sed -e 's|@''REPLACE_CBRTF''@|$(REPLACE_CBRTF)|g' \
-             -e 's|@''REPLACE_CBRTL''@|$(REPLACE_CBRTL)|g' \
-             -e 's|@''REPLACE_CEIL''@|$(REPLACE_CEIL)|g' \
-             -e 's|@''REPLACE_CEILF''@|$(REPLACE_CEILF)|g' \
-             -e 's|@''REPLACE_CEILL''@|$(REPLACE_CEILL)|g' \
-             -e 's|@''REPLACE_EXPM1''@|$(REPLACE_EXPM1)|g' \
-             -e 's|@''REPLACE_EXPM1F''@|$(REPLACE_EXPM1F)|g' \
-             -e 's|@''REPLACE_EXP2''@|$(REPLACE_EXP2)|g' \
-             -e 's|@''REPLACE_EXP2L''@|$(REPLACE_EXP2L)|g' \
-             -e 's|@''REPLACE_FABSL''@|$(REPLACE_FABSL)|g' \
-             -e 's|@''REPLACE_FLOOR''@|$(REPLACE_FLOOR)|g' \
-             -e 's|@''REPLACE_FLOORF''@|$(REPLACE_FLOORF)|g' \
-             -e 's|@''REPLACE_FLOORL''@|$(REPLACE_FLOORL)|g' \
-             -e 's|@''REPLACE_FMA''@|$(REPLACE_FMA)|g' \
-             -e 's|@''REPLACE_FMAF''@|$(REPLACE_FMAF)|g' \
-             -e 's|@''REPLACE_FMAL''@|$(REPLACE_FMAL)|g' \
-             -e 's|@''REPLACE_FMOD''@|$(REPLACE_FMOD)|g' \
-             -e 's|@''REPLACE_FMODF''@|$(REPLACE_FMODF)|g' \
-             -e 's|@''REPLACE_FMODL''@|$(REPLACE_FMODL)|g' \
-             -e 's|@''REPLACE_FREXPF''@|$(REPLACE_FREXPF)|g' \
-             -e 's|@''REPLACE_FREXP''@|$(REPLACE_FREXP)|g' \
-             -e 's|@''REPLACE_FREXPL''@|$(REPLACE_FREXPL)|g' \
-             -e 's|@''REPLACE_HUGE_VAL''@|$(REPLACE_HUGE_VAL)|g' \
-             -e 's|@''REPLACE_HYPOT''@|$(REPLACE_HYPOT)|g' \
-             -e 's|@''REPLACE_HYPOTF''@|$(REPLACE_HYPOTF)|g' \
-             -e 's|@''REPLACE_HYPOTL''@|$(REPLACE_HYPOTL)|g' \
-             -e 's|@''REPLACE_ILOGB''@|$(REPLACE_ILOGB)|g' \
-             -e 's|@''REPLACE_ILOGBF''@|$(REPLACE_ILOGBF)|g' \
-             -e 's|@''REPLACE_ISFINITE''@|$(REPLACE_ISFINITE)|g' \
-             -e 's|@''REPLACE_ISINF''@|$(REPLACE_ISINF)|g' \
-             -e 's|@''REPLACE_ISNAN''@|$(REPLACE_ISNAN)|g' \
-             -e 's|@''REPLACE_ITOLD''@|$(REPLACE_ITOLD)|g' \
-             -e 's|@''REPLACE_LDEXPL''@|$(REPLACE_LDEXPL)|g' \
-             -e 's|@''REPLACE_LOG''@|$(REPLACE_LOG)|g' \
-             -e 's|@''REPLACE_LOGF''@|$(REPLACE_LOGF)|g' \
-             -e 's|@''REPLACE_LOGL''@|$(REPLACE_LOGL)|g' \
-             -e 's|@''REPLACE_LOG10''@|$(REPLACE_LOG10)|g' \
-             -e 's|@''REPLACE_LOG10F''@|$(REPLACE_LOG10F)|g' \
-             -e 's|@''REPLACE_LOG10L''@|$(REPLACE_LOG10L)|g' \
-             -e 's|@''REPLACE_LOG1P''@|$(REPLACE_LOG1P)|g' \
-             -e 's|@''REPLACE_LOG1PF''@|$(REPLACE_LOG1PF)|g' \
-             -e 's|@''REPLACE_LOG1PL''@|$(REPLACE_LOG1PL)|g' \
-             -e 's|@''REPLACE_LOG2''@|$(REPLACE_LOG2)|g' \
-             -e 's|@''REPLACE_LOG2F''@|$(REPLACE_LOG2F)|g' \
-             -e 's|@''REPLACE_LOG2L''@|$(REPLACE_LOG2L)|g' \
-             -e 's|@''REPLACE_LOGB''@|$(REPLACE_LOGB)|g' \
-             -e 's|@''REPLACE_LOGBF''@|$(REPLACE_LOGBF)|g' \
-             -e 's|@''REPLACE_LOGBL''@|$(REPLACE_LOGBL)|g' \
-             -e 's|@''REPLACE_MODF''@|$(REPLACE_MODF)|g' \
-             -e 's|@''REPLACE_MODFF''@|$(REPLACE_MODFF)|g' \
-             -e 's|@''REPLACE_MODFL''@|$(REPLACE_MODFL)|g' \
-             -e 's|@''REPLACE_NAN''@|$(REPLACE_NAN)|g' \
-             -e 's|@''REPLACE_REMAINDER''@|$(REPLACE_REMAINDER)|g' \
-             -e 's|@''REPLACE_REMAINDERF''@|$(REPLACE_REMAINDERF)|g' \
-             -e 's|@''REPLACE_REMAINDERL''@|$(REPLACE_REMAINDERL)|g' \
-             -e 's|@''REPLACE_ROUND''@|$(REPLACE_ROUND)|g' \
-             -e 's|@''REPLACE_ROUNDF''@|$(REPLACE_ROUNDF)|g' \
-             -e 's|@''REPLACE_ROUNDL''@|$(REPLACE_ROUNDL)|g' \
-             -e 's|@''REPLACE_SIGNBIT''@|$(REPLACE_SIGNBIT)|g' \
-             -e 
's|@''REPLACE_SIGNBIT_USING_GCC''@|$(REPLACE_SIGNBIT_USING_GCC)|g' \
-             -e 's|@''REPLACE_SQRTL''@|$(REPLACE_SQRTL)|g' \
-             -e 's|@''REPLACE_TRUNC''@|$(REPLACE_TRUNC)|g' \
-             -e 's|@''REPLACE_TRUNCF''@|$(REPLACE_TRUNCF)|g' \
-             -e 's|@''REPLACE_TRUNCL''@|$(REPLACE_TRUNCL)|g' \
-             -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-             -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-             -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
-       } > address@hidden && \
-       mv address@hidden $@
-MOSTLYCLEANFILES += math.h math.h-t
-
-EXTRA_DIST += math.in.h
-
-## end   gnulib module math
-
 ## begin gnulib module mbchar
 
 libgnu_a_SOURCES += mbchar.c
@@ -956,7 +646,9 @@
 
 ## begin gnulib module mbtowc
 
+if gl_GNULIB_ENABLED_mbtowc
 
+endif
 EXTRA_DIST += mbtowc-impl.h mbtowc.c
 
 EXTRA_libgnu_a_SOURCES += mbtowc.c
@@ -989,7 +681,9 @@
 
 ## begin gnulib module mempcpy
 
+if gl_GNULIB_ENABLED_mempcpy
 
+endif
 EXTRA_DIST += mempcpy.c
 
 EXTRA_libgnu_a_SOURCES += mempcpy.c
@@ -1016,7 +710,9 @@
 
 ## begin gnulib module msvc-inval
 
+if gl_GNULIB_ENABLED_f691f076f650964c9f5598c3ee487616
 
+endif
 EXTRA_DIST += msvc-inval.c msvc-inval.h
 
 EXTRA_libgnu_a_SOURCES += msvc-inval.c
@@ -1025,7 +721,9 @@
 
 ## begin gnulib module msvc-nothrow
 
+if gl_GNULIB_ENABLED_676220fa4366efa9bdbfccf11a857c07
 
+endif
 EXTRA_DIST += msvc-nothrow.c msvc-nothrow.h
 
 EXTRA_libgnu_a_SOURCES += msvc-nothrow.c
@@ -1034,7 +732,9 @@
 
 ## begin gnulib module nl_langinfo
 
+if gl_GNULIB_ENABLED_nl_langinfo
 
+endif
 EXTRA_DIST += nl_langinfo.c
 
 EXTRA_libgnu_a_SOURCES += nl_langinfo.c
@@ -1043,29 +743,13 @@
 
 ## begin gnulib module pathmax
 
+if gl_GNULIB_ENABLED_pathmax
 
+endif
 EXTRA_DIST += pathmax.h
 
 ## end   gnulib module pathmax
 
-## begin gnulib module printf-frexp
-
-libgnu_a_SOURCES += printf-frexp.c
-
-EXTRA_DIST += printf-frexp.h
-
-## end   gnulib module printf-frexp
-
-## begin gnulib module printf-frexpl
-
-libgnu_a_SOURCES += printf-frexpl.c
-
-EXTRA_DIST += printf-frexp.c printf-frexpl.h
-
-EXTRA_libgnu_a_SOURCES += printf-frexp.c
-
-## end   gnulib module printf-frexpl
-
 ## begin gnulib module regex
 
 
@@ -1077,26 +761,21 @@
 
 ## begin gnulib module secure_getenv
 
+if gl_GNULIB_ENABLED_secure_getenv
 
+endif
 EXTRA_DIST += secure_getenv.c
 
 EXTRA_libgnu_a_SOURCES += secure_getenv.c
 
 ## end   gnulib module secure_getenv
 
-## begin gnulib module signbit
-
-
-EXTRA_DIST += float+.h signbitd.c signbitf.c signbitl.c
-
-EXTRA_libgnu_a_SOURCES += signbitd.c signbitf.c signbitl.c
-
-## end   gnulib module signbit
-
 ## begin gnulib module size_max
 
+if gl_GNULIB_ENABLED_size_max
 libgnu_a_SOURCES += size_max.h
 
+endif
 ## end   gnulib module size_max
 
 ## begin gnulib module snippet/_Noreturn
@@ -1182,7 +861,9 @@
 
 ## begin gnulib module stat
 
+if gl_GNULIB_ENABLED_stat
 
+endif
 EXTRA_DIST += stat.c
 
 EXTRA_libgnu_a_SOURCES += stat.c
@@ -1556,7 +1237,9 @@
 
 ## begin gnulib module stpcpy
 
+if gl_GNULIB_ENABLED_stpcpy
 
+endif
 EXTRA_DIST += stpcpy.c
 
 EXTRA_libgnu_a_SOURCES += stpcpy.c
@@ -1608,7 +1291,9 @@
 
 ## begin gnulib module strerror-override
 
+if gl_GNULIB_ENABLED_dbb57f49352be8fb86869629a254fb72
 
+endif
 EXTRA_DIST += strerror-override.c strerror-override.h
 
 EXTRA_libgnu_a_SOURCES += strerror-override.c
@@ -1748,7 +1433,9 @@
 
 ## begin gnulib module strndup
 
+if gl_GNULIB_ENABLED_strndup
 
+endif
 EXTRA_DIST += strndup.c
 
 EXTRA_libgnu_a_SOURCES += strndup.c
@@ -1772,7 +1459,9 @@
 
 ## begin gnulib module strstr-simple
 
+if gl_GNULIB_ENABLED_f84f170cca5f5b09d22686d5b833aa41
 
+endif
 EXTRA_DIST += str-two-way.h strstr.c
 
 EXTRA_libgnu_a_SOURCES += strstr.c
@@ -1781,6 +1470,7 @@
 
 ## begin gnulib module sys_stat
 
+if gl_GNULIB_ENABLED_sys_stat
 BUILT_SOURCES += sys/stat.h
 
 # We need the following in order to create <sys/stat.h> when the system
@@ -1837,12 +1527,14 @@
 MOSTLYCLEANFILES += sys/stat.h sys/stat.h-t
 MOSTLYCLEANDIRS += sys
 
+endif
 EXTRA_DIST += sys_stat.in.h
 
 ## end   gnulib module sys_stat
 
 ## begin gnulib module sys_time
 
+if gl_GNULIB_ENABLED_sys_time
 BUILT_SOURCES += sys/time.h
 
 # We need the following in order to create <sys/time.h> when the system
@@ -1871,6 +1563,7 @@
        mv address@hidden $@
 MOSTLYCLEANFILES += sys/time.h sys/time.h-t
 
+endif
 EXTRA_DIST += sys_time.in.h
 
 ## end   gnulib module sys_time
@@ -1902,22 +1595,27 @@
 
 ## begin gnulib module tempname
 
+if gl_GNULIB_ENABLED_tempname
 libgnu_a_SOURCES += tempname.c
 
+endif
 EXTRA_DIST += tempname.h
 
 ## end   gnulib module tempname
 
 ## begin gnulib module threadlib
 
+if gl_GNULIB_ENABLED_threadlib
 libgnu_a_SOURCES += glthread/threadlib.c
 
+endif
 EXTRA_DIST += $(top_srcdir)/build-aux/config.rpath
 
 ## end   gnulib module threadlib
 
 ## begin gnulib module time
 
+if gl_GNULIB_ENABLED_time
 BUILT_SOURCES += time.h
 
 # We need the following in order to create <time.h> when the system
@@ -1958,6 +1656,7 @@
        mv address@hidden $@
 MOSTLYCLEANFILES += time.h time.h-t
 
+endif
 EXTRA_DIST += time.in.h
 
 ## end   gnulib module time
@@ -2160,7 +1859,9 @@
 
 ## begin gnulib module vasnprintf
 
+if gl_GNULIB_ENABLED_vasnprintf
 
+endif
 EXTRA_DIST += asnprintf.c float+.h printf-args.c printf-args.h printf-parse.c 
printf-parse.h vasnprintf.c vasnprintf.h
 
 EXTRA_libgnu_a_SOURCES += asnprintf.c printf-args.c printf-parse.c vasnprintf.c
@@ -2306,7 +2007,9 @@
 
 ## begin gnulib module wcrtomb
 
+if gl_GNULIB_ENABLED_wcrtomb
 
+endif
 EXTRA_DIST += wcrtomb.c
 
 EXTRA_libgnu_a_SOURCES += wcrtomb.c
@@ -2385,8 +2088,10 @@
 
 ## begin gnulib module xsize
 
+if gl_GNULIB_ENABLED_xsize
 libgnu_a_SOURCES += xsize.h xsize.c
 
+endif
 ## end   gnulib module xsize
 
 

Modified: trunk/gnulib/m4/gnulib-cache.m4
===================================================================
--- trunk/gnulib/m4/gnulib-cache.m4     2015-10-16 11:44:07 UTC (rev 6699)
+++ trunk/gnulib/m4/gnulib-cache.m4     2015-10-16 17:18:03 UTC (rev 6700)
@@ -27,7 +27,7 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib 
--m4-base=gnulib/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux 
--no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files argz 
getopt-gnu gettext iconv mbchar mbiter mbscasecmp mbschr mbslen mbsncasecmp 
mbsstr mbswidth memmem memrchr mkstemp regex stdarg strcasestr strdup-posix 
strerror vasprintf-posix xalloc
+#   gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib 
--m4-base=gnulib/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux 
--conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files argz 
getopt-gnu gettext iconv mbchar mbiter mbscasecmp mbschr mbslen mbsncasecmp 
mbsstr mbswidth memmem memrchr mkstemp regex stdarg strcasestr strdup-posix 
strerror vasprintf xalloc
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([])
@@ -52,7 +52,7 @@
   strcasestr
   strdup-posix
   strerror
-  vasprintf-posix
+  vasprintf
   xalloc
 ])
 gl_AVOID([])
@@ -63,6 +63,7 @@
 gl_TESTS_BASE([tests])
 gl_LIB([libgnu])
 gl_MAKEFILE_NAME([])
+gl_CONDITIONAL_DEPENDENCIES
 gl_MACRO_PREFIX([gl])
 gl_PO_DOMAIN([])
 gl_WITNESS_C_MACRO([])

Modified: trunk/gnulib/m4/gnulib-comp.m4
===================================================================
--- trunk/gnulib/m4/gnulib-comp.m4      2015-10-16 11:44:07 UTC (rev 6699)
+++ trunk/gnulib/m4/gnulib-comp.m4      2015-10-16 17:18:03 UTC (rev 6700)
@@ -53,11 +53,6 @@
   # Code from module extern-inline:
   # Code from module fcntl-h:
   # Code from module float:
-  # Code from module fpieee:
-  AC_REQUIRE([gl_FP_IEEE])
-  # Code from module fpucw:
-  # Code from module frexp-nolibm:
-  # Code from module frexpl-nolibm:
   # Code from module getopt-gnu:
   # Code from module getopt-posix:
   # Code from module gettext:
@@ -67,9 +62,6 @@
   # Code from module iconv:
   # Code from module include_next:
   # Code from module intprops:
-  # Code from module isnand-nolibm:
-  # Code from module isnanf-nolibm:
-  # Code from module isnanl-nolibm:
   # Code from module iswblank:
   # Code from module langinfo:
   # Code from module largefile:
@@ -81,7 +73,6 @@
   # Code from module lstat:
   # Code from module malloc-posix:
   # Code from module malloca:
-  # Code from module math:
   # Code from module mbchar:
   # Code from module mbiter:
   # Code from module mbrtowc:
@@ -106,12 +97,8 @@
   # Code from module nl_langinfo:
   # Code from module nocrash:
   # Code from module pathmax:
-  # Code from module printf-frexp:
-  # Code from module printf-frexpl:
-  # Code from module printf-safe:
   # Code from module regex:
   # Code from module secure_getenv:
-  # Code from module signbit:
   # Code from module size_max:
   # Code from module snippet/_Noreturn:
   # Code from module snippet/arg-nonnull:
@@ -158,7 +145,6 @@
   # Code from module uniwidth/width:
   # Code from module vasnprintf:
   # Code from module vasprintf:
-  # Code from module vasprintf-posix:
   # Code from module verify:
   # Code from module wchar:
   # Code from module wcrtomb:
@@ -191,13 +177,6 @@
   if test -n "$ARGZ_H"; then
     AC_LIBOBJ([argz])
   fi
-  gl_FUNC_BTOWC
-  if test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1; then
-    AC_LIBOBJ([btowc])
-    gl_PREREQ_BTOWC
-  fi
-  gl_WCHAR_MODULE_INDICATOR([btowc])
-  gl_CONFIGMAKE_PREP
   gl_HEADER_ERRNO_H
   gl_ERROR
   if test $ac_cv_lib_error_at_line = no; then
@@ -208,7 +187,6 @@
     [AM_][XGETTEXT_OPTION([--flag=error:3:c-format])
      AM_][XGETTEXT_OPTION([--flag=error_at_line:5:c-format])])
   AC_REQUIRE([gl_EXTERN_INLINE])
-  gl_FCNTL_H
   gl_FLOAT_H
   if test $REPLACE_FLOAT_LDBL = 1; then
     AC_LIBOBJ([float])
@@ -216,16 +194,6 @@
   if test $REPLACE_ITOLD = 1; then
     AC_LIBOBJ([itold])
   fi
-  gl_FUNC_FREXP_NO_LIBM
-  if test $gl_func_frexp_no_libm != yes; then
-    AC_LIBOBJ([frexp])
-  fi
-  gl_MATH_MODULE_INDICATOR([frexp])
-  gl_FUNC_FREXPL_NO_LIBM
-  if test $HAVE_DECL_FREXPL = 0 || test $gl_func_frexpl_no_libm = no; then
-    AC_LIBOBJ([frexpl])
-  fi
-  gl_MATH_MODULE_INDICATOR([frexpl])
   gl_FUNC_GETOPT_GNU
   if test $REPLACE_GETOPT = 1; then
     AC_LIBOBJ([getopt])
@@ -249,30 +217,9 @@
   AM_GNU_GETTEXT_VERSION([0.18.1])
   AC_SUBST([LIBINTL])
   AC_SUBST([LTLIBINTL])
-  gl_FUNC_GETTIMEOFDAY
-  if test $HAVE_GETTIMEOFDAY = 0 || test $REPLACE_GETTIMEOFDAY = 1; then
-    AC_LIBOBJ([gettimeofday])
-    gl_PREREQ_GETTIMEOFDAY
-  fi
-  gl_SYS_TIME_MODULE_INDICATOR([gettimeofday])
   AM_ICONV
   m4_ifdef([gl_ICONV_MODULE_INDICATOR],
     [gl_ICONV_MODULE_INDICATOR([iconv])])
-  gl_FUNC_ISNAND_NO_LIBM
-  if test $gl_func_isnand_no_libm != yes; then
-    AC_LIBOBJ([isnand])
-    gl_PREREQ_ISNAND
-  fi
-  gl_FUNC_ISNANF_NO_LIBM
-  if test $gl_func_isnanf_no_libm != yes; then
-    AC_LIBOBJ([isnanf])
-    gl_PREREQ_ISNANF
-  fi
-  gl_FUNC_ISNANL_NO_LIBM
-  if test $gl_func_isnanl_no_libm != yes; then
-    AC_LIBOBJ([isnanl])
-    gl_PREREQ_ISNANL
-  fi
   gl_FUNC_ISWBLANK
   if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then
     :
@@ -282,33 +229,8 @@
     fi
   fi
   gl_WCTYPE_MODULE_INDICATOR([iswblank])
-  gl_LANGINFO_H
   AC_REQUIRE([gl_LARGEFILE])
-  gl_LOCALCHARSET
-  
LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\""
-  AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT])
-  gl_LOCALE_H
-  gl_FUNC_LOCALECONV
-  if test $REPLACE_LOCALECONV = 1; then
-    AC_LIBOBJ([localeconv])
-    gl_PREREQ_LOCALECONV
-  fi
-  gl_LOCALE_MODULE_INDICATOR([localeconv])
-  gl_LOCK
-  gl_MODULE_INDICATOR([lock])
-  gl_FUNC_LSTAT
-  if test $REPLACE_LSTAT = 1; then
-    AC_LIBOBJ([lstat])
-    gl_PREREQ_LSTAT
-  fi
-  gl_SYS_STAT_MODULE_INDICATOR([lstat])
-  gl_FUNC_MALLOC_POSIX
-  if test $REPLACE_MALLOC = 1; then
-    AC_LIBOBJ([malloc])
-  fi
-  gl_STDLIB_MODULE_INDICATOR([malloc-posix])
   gl_MALLOCA
-  gl_MATH_H
   gl_MBCHAR
   gl_MBITER
   gl_FUNC_MBRTOWC
@@ -330,12 +252,6 @@
   gl_STRING_MODULE_INDICATOR([mbsncasecmp])
   gl_STRING_MODULE_INDICATOR([mbsstr])
   gl_MBSWIDTH
-  gl_FUNC_MBTOWC
-  if test $REPLACE_MBTOWC = 1; then
-    AC_LIBOBJ([mbtowc])
-    gl_PREREQ_MBTOWC
-  fi
-  gl_STDLIB_MODULE_INDICATOR([mbtowc])
   gl_MBITER
   gl_FUNC_MEMCHR
   if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then
@@ -352,12 +268,6 @@
     AC_LIBOBJ([memmem])
   fi
   gl_STRING_MODULE_INDICATOR([memmem])
-  gl_FUNC_MEMPCPY
-  if test $HAVE_MEMPCPY = 0; then
-    AC_LIBOBJ([mempcpy])
-    gl_PREREQ_MEMPCPY
-  fi
-  gl_STRING_MODULE_INDICATOR([mempcpy])
   gl_FUNC_MEMRCHR
   if test $ac_cv_func_memrchr = no; then
     AC_LIBOBJ([memrchr])
@@ -370,62 +280,19 @@
     gl_PREREQ_MKSTEMP
   fi
   gl_STDLIB_MODULE_INDICATOR([mkstemp])
-  gl_MSVC_INVAL
-  if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
-    AC_LIBOBJ([msvc-inval])
-  fi
-  gl_MSVC_NOTHROW
-  if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
-    AC_LIBOBJ([msvc-nothrow])
-  fi
   gl_MULTIARCH
-  gl_FUNC_NL_LANGINFO
-  if test $HAVE_NL_LANGINFO = 0 || test $REPLACE_NL_LANGINFO = 1; then
-    AC_LIBOBJ([nl_langinfo])
-  fi
-  gl_LANGINFO_MODULE_INDICATOR([nl_langinfo])
-  gl_PATHMAX
-  gl_FUNC_PRINTF_FREXP
-  gl_FUNC_PRINTF_FREXPL
-  m4_divert_text([INIT_PREPARE], [gl_printf_safe=yes])
   gl_REGEX
   if test $ac_use_included_regex = yes; then
     AC_LIBOBJ([regex])
     gl_PREREQ_REGEX
   fi
-  gl_FUNC_SECURE_GETENV
-  if test $HAVE_SECURE_GETENV = 0; then
-    AC_LIBOBJ([secure_getenv])
-    gl_PREREQ_SECURE_GETENV
-  fi
-  gl_STDLIB_MODULE_INDICATOR([secure_getenv])
-  gl_SIGNBIT
-  if test $REPLACE_SIGNBIT = 1; then
-    AC_LIBOBJ([signbitf])
-    AC_LIBOBJ([signbitd])
-    AC_LIBOBJ([signbitl])
-  fi
-  gl_MATH_MODULE_INDICATOR([signbit])
-  gl_SIZE_MAX
   gt_TYPE_SSIZE_T
-  gl_FUNC_STAT
-  if test $REPLACE_STAT = 1; then
-    AC_LIBOBJ([stat])
-    gl_PREREQ_STAT
-  fi
-  gl_SYS_STAT_MODULE_INDICATOR([stat])
   gl_STDARG_H
   AM_STDBOOL_H
   gl_STDDEF_H
   gl_STDINT_H
   gl_STDIO_H
   gl_STDLIB_H
-  gl_FUNC_STPCPY
-  if test $HAVE_STPCPY = 0; then
-    AC_LIBOBJ([stpcpy])
-    gl_PREREQ_STPCPY
-  fi
-  gl_STRING_MODULE_INDICATOR([stpcpy])
   gl_STRCASE
   if test $HAVE_STRCASECMP = 0; then
     AC_LIBOBJ([strcasecmp])
@@ -458,61 +325,26 @@
   fi
   gl_MODULE_INDICATOR([strerror])
   gl_STRING_MODULE_INDICATOR([strerror])
-  AC_REQUIRE([gl_HEADER_ERRNO_H])
-  AC_REQUIRE([gl_FUNC_STRERROR_0])
-  if test -n "$ERRNO_H" || test $REPLACE_STRERROR_0 = 1; then
-    AC_LIBOBJ([strerror-override])
-    gl_PREREQ_SYS_H_WINSOCK2
-  fi
   gl_HEADER_STRING_H
   gl_HEADER_STRINGS_H
-  gl_FUNC_STRNDUP
-  if test $HAVE_STRNDUP = 0 || test $REPLACE_STRNDUP = 1; then
-    AC_LIBOBJ([strndup])
-  fi
-  gl_STRING_MODULE_INDICATOR([strndup])
   gl_FUNC_STRNLEN
   if test $HAVE_DECL_STRNLEN = 0 || test $REPLACE_STRNLEN = 1; then
     AC_LIBOBJ([strnlen])
     gl_PREREQ_STRNLEN
   fi
   gl_STRING_MODULE_INDICATOR([strnlen])
-  gl_FUNC_STRSTR
-  if test $REPLACE_STRSTR = 1; then
-    AC_LIBOBJ([strstr])
-  fi
-  gl_FUNC_STRSTR_SIMPLE
-  if test $REPLACE_STRSTR = 1; then
-    AC_LIBOBJ([strstr])
-  fi
-  gl_STRING_MODULE_INDICATOR([strstr])
-  gl_HEADER_SYS_STAT_H
-  AC_PROG_MKDIR_P
-  gl_HEADER_SYS_TIME_H
-  AC_PROG_MKDIR_P
   gl_SYS_TYPES_H
   AC_PROG_MKDIR_P
-  gl_FUNC_GEN_TEMPNAME
-  gl_THREADLIB
-  gl_HEADER_TIME_H
   gl_UNISTD_H
   gl_LIBUNISTRING_LIBHEADER([0.9.4], [unitypes.h])
   gl_LIBUNISTRING_LIBHEADER([0.9.4], [uniwidth.h])
   gl_LIBUNISTRING_MODULE([0.9.6], [uniwidth/width])
-  gl_FUNC_VASNPRINTF
   gl_FUNC_VASPRINTF
   gl_STDIO_MODULE_INDICATOR([vasprintf])
   m4_ifdef([AM_XGETTEXT_OPTION],
     [AM_][XGETTEXT_OPTION([--flag=asprintf:2:c-format])
      AM_][XGETTEXT_OPTION([--flag=vasprintf:2:c-format])])
-  gl_FUNC_VASPRINTF_POSIX
   gl_WCHAR_H
-  gl_FUNC_WCRTOMB
-  if test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1; then
-    AC_LIBOBJ([wcrtomb])
-    gl_PREREQ_WCRTOMB
-  fi
-  gl_WCHAR_MODULE_INDICATOR([wcrtomb])
   gl_WCTYPE_H
   gl_FUNC_WCWIDTH
   if test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1; then
@@ -520,7 +352,490 @@
   fi
   gl_WCHAR_MODULE_INDICATOR([wcwidth])
   gl_XALLOC
-  gl_XSIZE
+  gl_gnulib_enabled_btowc=false
+  gl_gnulib_enabled_configmake=false
+  gl_gnulib_enabled_dosname=false
+  gl_gnulib_enabled_deb6c5f14b16306a85c59bccf4d416d8=false
+  gl_gnulib_enabled_gettimeofday=false
+  gl_gnulib_enabled_intprops=false
+  gl_gnulib_enabled_langinfo=false
+  gl_gnulib_enabled_localcharset=false
+  gl_gnulib_enabled_locale=false
+  gl_gnulib_enabled_localeconv=false
+  gl_gnulib_enabled_lock=false
+  gl_gnulib_enabled_lstat=false
+  gl_gnulib_enabled_ef455225c00f5049c808c2eda3e76866=false
+  gl_gnulib_enabled_mbtowc=false
+  gl_gnulib_enabled_mempcpy=false
+  gl_gnulib_enabled_f691f076f650964c9f5598c3ee487616=false
+  gl_gnulib_enabled_676220fa4366efa9bdbfccf11a857c07=false
+  gl_gnulib_enabled_nl_langinfo=false
+  gl_gnulib_enabled_pathmax=false
+  gl_gnulib_enabled_secure_getenv=false
+  gl_gnulib_enabled_size_max=false
+  gl_gnulib_enabled_stat=false
+  gl_gnulib_enabled_stpcpy=false
+  gl_gnulib_enabled_dbb57f49352be8fb86869629a254fb72=false
+  gl_gnulib_enabled_strndup=false
+  gl_gnulib_enabled_strstr=false
+  gl_gnulib_enabled_f84f170cca5f5b09d22686d5b833aa41=false
+  gl_gnulib_enabled_sys_stat=false
+  gl_gnulib_enabled_sys_time=false
+  gl_gnulib_enabled_tempname=false
+  gl_gnulib_enabled_threadlib=false
+  gl_gnulib_enabled_time=false
+  gl_gnulib_enabled_vasnprintf=false
+  gl_gnulib_enabled_wcrtomb=false
+  gl_gnulib_enabled_xsize=false
+  func_gl_gnulib_m4code_btowc ()
+  {
+    if ! $gl_gnulib_enabled_btowc; then
+      gl_FUNC_BTOWC
+      if test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1; then
+        AC_LIBOBJ([btowc])
+        gl_PREREQ_BTOWC
+      fi
+      gl_WCHAR_MODULE_INDICATOR([btowc])
+      gl_gnulib_enabled_btowc=true
+      if test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1; then
+        func_gl_gnulib_m4code_mbtowc
+      fi
+    fi
+  }
+  func_gl_gnulib_m4code_configmake ()
+  {
+    if ! $gl_gnulib_enabled_configmake; then
+      gl_CONFIGMAKE_PREP
+      gl_gnulib_enabled_configmake=true
+    fi
+  }
+  func_gl_gnulib_m4code_dosname ()
+  {
+    if ! $gl_gnulib_enabled_dosname; then
+      gl_gnulib_enabled_dosname=true
+    fi
+  }
+  func_gl_gnulib_m4code_deb6c5f14b16306a85c59bccf4d416d8 ()
+  {
+    if ! $gl_gnulib_enabled_deb6c5f14b16306a85c59bccf4d416d8; then
+      gl_FCNTL_H
+      gl_gnulib_enabled_deb6c5f14b16306a85c59bccf4d416d8=true
+    fi
+  }
+  func_gl_gnulib_m4code_gettimeofday ()
+  {
+    if ! $gl_gnulib_enabled_gettimeofday; then
+      gl_FUNC_GETTIMEOFDAY
+      if test $HAVE_GETTIMEOFDAY = 0 || test $REPLACE_GETTIMEOFDAY = 1; then
+        AC_LIBOBJ([gettimeofday])
+        gl_PREREQ_GETTIMEOFDAY
+      fi
+      gl_SYS_TIME_MODULE_INDICATOR([gettimeofday])
+      gl_gnulib_enabled_gettimeofday=true
+      func_gl_gnulib_m4code_sys_time
+    fi
+  }
+  func_gl_gnulib_m4code_intprops ()
+  {
+    if ! $gl_gnulib_enabled_intprops; then
+      gl_gnulib_enabled_intprops=true
+    fi
+  }
+  func_gl_gnulib_m4code_langinfo ()
+  {
+    if ! $gl_gnulib_enabled_langinfo; then
+      gl_LANGINFO_H
+      gl_gnulib_enabled_langinfo=true
+    fi
+  }
+  func_gl_gnulib_m4code_localcharset ()
+  {
+    if ! $gl_gnulib_enabled_localcharset; then
+      gl_LOCALCHARSET
+      
LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\""
+      AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT])
+      gl_gnulib_enabled_localcharset=true
+      func_gl_gnulib_m4code_configmake
+    fi
+  }
+  func_gl_gnulib_m4code_locale ()
+  {
+    if ! $gl_gnulib_enabled_locale; then
+      gl_LOCALE_H
+      gl_gnulib_enabled_locale=true
+    fi
+  }
+  func_gl_gnulib_m4code_localeconv ()
+  {
+    if ! $gl_gnulib_enabled_localeconv; then
+      gl_FUNC_LOCALECONV
+      if test $REPLACE_LOCALECONV = 1; then
+        AC_LIBOBJ([localeconv])
+        gl_PREREQ_LOCALECONV
+      fi
+      gl_LOCALE_MODULE_INDICATOR([localeconv])
+      gl_gnulib_enabled_localeconv=true
+      func_gl_gnulib_m4code_locale
+    fi
+  }
+  func_gl_gnulib_m4code_lock ()
+  {
+    if ! $gl_gnulib_enabled_lock; then
+      gl_LOCK
+      gl_MODULE_INDICATOR([lock])
+      gl_gnulib_enabled_lock=true
+      func_gl_gnulib_m4code_threadlib
+    fi
+  }
+  func_gl_gnulib_m4code_lstat ()
+  {
+    if ! $gl_gnulib_enabled_lstat; then
+      gl_FUNC_LSTAT
+      if test $REPLACE_LSTAT = 1; then
+        AC_LIBOBJ([lstat])
+        gl_PREREQ_LSTAT
+      fi
+      gl_SYS_STAT_MODULE_INDICATOR([lstat])
+      gl_gnulib_enabled_lstat=true
+      if test $REPLACE_LSTAT = 1; then
+        func_gl_gnulib_m4code_dosname
+      fi
+      if test $REPLACE_LSTAT = 1; then
+        func_gl_gnulib_m4code_stat
+      fi
+      func_gl_gnulib_m4code_sys_stat
+    fi
+  }
+  func_gl_gnulib_m4code_ef455225c00f5049c808c2eda3e76866 ()
+  {
+    if ! $gl_gnulib_enabled_ef455225c00f5049c808c2eda3e76866; then
+      gl_FUNC_MALLOC_POSIX
+      if test $REPLACE_MALLOC = 1; then
+        AC_LIBOBJ([malloc])
+      fi
+      gl_STDLIB_MODULE_INDICATOR([malloc-posix])
+      gl_gnulib_enabled_ef455225c00f5049c808c2eda3e76866=true
+    fi
+  }
+  func_gl_gnulib_m4code_mbtowc ()
+  {
+    if ! $gl_gnulib_enabled_mbtowc; then
+      gl_FUNC_MBTOWC
+      if test $REPLACE_MBTOWC = 1; then
+        AC_LIBOBJ([mbtowc])
+        gl_PREREQ_MBTOWC
+      fi
+      gl_STDLIB_MODULE_INDICATOR([mbtowc])
+      gl_gnulib_enabled_mbtowc=true
+    fi
+  }
+  func_gl_gnulib_m4code_mempcpy ()
+  {
+    if ! $gl_gnulib_enabled_mempcpy; then
+      gl_FUNC_MEMPCPY
+      if test $HAVE_MEMPCPY = 0; then
+        AC_LIBOBJ([mempcpy])
+        gl_PREREQ_MEMPCPY
+      fi
+      gl_STRING_MODULE_INDICATOR([mempcpy])
+      gl_gnulib_enabled_mempcpy=true
+    fi
+  }
+  func_gl_gnulib_m4code_f691f076f650964c9f5598c3ee487616 ()
+  {
+    if ! $gl_gnulib_enabled_f691f076f650964c9f5598c3ee487616; then
+      gl_MSVC_INVAL
+      if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
+        AC_LIBOBJ([msvc-inval])
+      fi
+      gl_gnulib_enabled_f691f076f650964c9f5598c3ee487616=true
+    fi
+  }
+  func_gl_gnulib_m4code_676220fa4366efa9bdbfccf11a857c07 ()
+  {
+    if ! $gl_gnulib_enabled_676220fa4366efa9bdbfccf11a857c07; then
+      gl_MSVC_NOTHROW
+      if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
+        AC_LIBOBJ([msvc-nothrow])
+      fi
+      gl_gnulib_enabled_676220fa4366efa9bdbfccf11a857c07=true
+      func_gl_gnulib_m4code_f691f076f650964c9f5598c3ee487616
+    fi
+  }
+  func_gl_gnulib_m4code_nl_langinfo ()
+  {
+    if ! $gl_gnulib_enabled_nl_langinfo; then
+      gl_FUNC_NL_LANGINFO
+      if test $HAVE_NL_LANGINFO = 0 || test $REPLACE_NL_LANGINFO = 1; then
+        AC_LIBOBJ([nl_langinfo])
+      fi
+      gl_LANGINFO_MODULE_INDICATOR([nl_langinfo])
+      gl_gnulib_enabled_nl_langinfo=true
+      func_gl_gnulib_m4code_langinfo
+      if test $HAVE_NL_LANGINFO = 0 || test $REPLACE_NL_LANGINFO = 1; then
+        func_gl_gnulib_m4code_localeconv
+      fi
+    fi
+  }
+  func_gl_gnulib_m4code_pathmax ()
+  {
+    if ! $gl_gnulib_enabled_pathmax; then
+      gl_PATHMAX
+      gl_gnulib_enabled_pathmax=true
+    fi
+  }
+  func_gl_gnulib_m4code_secure_getenv ()
+  {
+    if ! $gl_gnulib_enabled_secure_getenv; then
+      gl_FUNC_SECURE_GETENV
+      if test $HAVE_SECURE_GETENV = 0; then
+        AC_LIBOBJ([secure_getenv])
+        gl_PREREQ_SECURE_GETENV
+      fi
+      gl_STDLIB_MODULE_INDICATOR([secure_getenv])
+      gl_gnulib_enabled_secure_getenv=true
+    fi
+  }
+  func_gl_gnulib_m4code_size_max ()
+  {
+    if ! $gl_gnulib_enabled_size_max; then
+      gl_SIZE_MAX
+      gl_gnulib_enabled_size_max=true
+    fi
+  }
+  func_gl_gnulib_m4code_stat ()
+  {
+    if ! $gl_gnulib_enabled_stat; then
+      gl_FUNC_STAT
+      if test $REPLACE_STAT = 1; then
+        AC_LIBOBJ([stat])
+        gl_PREREQ_STAT
+      fi
+      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
+      func_gl_gnulib_m4code_sys_stat
+    fi
+  }
+  func_gl_gnulib_m4code_stpcpy ()
+  {
+    if ! $gl_gnulib_enabled_stpcpy; then
+      gl_FUNC_STPCPY
+      if test $HAVE_STPCPY = 0; then
+        AC_LIBOBJ([stpcpy])
+        gl_PREREQ_STPCPY
+      fi
+      gl_STRING_MODULE_INDICATOR([stpcpy])
+      gl_gnulib_enabled_stpcpy=true
+    fi
+  }
+  func_gl_gnulib_m4code_dbb57f49352be8fb86869629a254fb72 ()
+  {
+    if ! $gl_gnulib_enabled_dbb57f49352be8fb86869629a254fb72; then
+      AC_REQUIRE([gl_HEADER_ERRNO_H])
+      AC_REQUIRE([gl_FUNC_STRERROR_0])
+      if test -n "$ERRNO_H" || test $REPLACE_STRERROR_0 = 1; then
+        AC_LIBOBJ([strerror-override])
+        gl_PREREQ_SYS_H_WINSOCK2
+      fi
+      gl_gnulib_enabled_dbb57f49352be8fb86869629a254fb72=true
+    fi
+  }
+  func_gl_gnulib_m4code_strndup ()
+  {
+    if ! $gl_gnulib_enabled_strndup; then
+      gl_FUNC_STRNDUP
+      if test $HAVE_STRNDUP = 0 || test $REPLACE_STRNDUP = 1; then
+        AC_LIBOBJ([strndup])
+      fi
+      gl_STRING_MODULE_INDICATOR([strndup])
+      gl_gnulib_enabled_strndup=true
+    fi
+  }
+  func_gl_gnulib_m4code_strstr ()
+  {
+    if ! $gl_gnulib_enabled_strstr; then
+      gl_FUNC_STRSTR
+      if test $REPLACE_STRSTR = 1; then
+        AC_LIBOBJ([strstr])
+      fi
+      gl_gnulib_enabled_strstr=true
+      func_gl_gnulib_m4code_f84f170cca5f5b09d22686d5b833aa41
+    fi
+  }
+  func_gl_gnulib_m4code_f84f170cca5f5b09d22686d5b833aa41 ()
+  {
+    if ! $gl_gnulib_enabled_f84f170cca5f5b09d22686d5b833aa41; then
+      gl_FUNC_STRSTR_SIMPLE
+      if test $REPLACE_STRSTR = 1; then
+        AC_LIBOBJ([strstr])
+      fi
+      gl_STRING_MODULE_INDICATOR([strstr])
+      gl_gnulib_enabled_f84f170cca5f5b09d22686d5b833aa41=true
+    fi
+  }
+  func_gl_gnulib_m4code_sys_stat ()
+  {
+    if ! $gl_gnulib_enabled_sys_stat; then
+      gl_HEADER_SYS_STAT_H
+      AC_PROG_MKDIR_P
+      gl_gnulib_enabled_sys_stat=true
+      func_gl_gnulib_m4code_time
+    fi
+  }
+  func_gl_gnulib_m4code_sys_time ()
+  {
+    if ! $gl_gnulib_enabled_sys_time; then
+      gl_HEADER_SYS_TIME_H
+      AC_PROG_MKDIR_P
+      gl_gnulib_enabled_sys_time=true
+    fi
+  }
+  func_gl_gnulib_m4code_tempname ()
+  {
+    if ! $gl_gnulib_enabled_tempname; then
+      gl_FUNC_GEN_TEMPNAME
+      gl_gnulib_enabled_tempname=true
+      func_gl_gnulib_m4code_deb6c5f14b16306a85c59bccf4d416d8
+      func_gl_gnulib_m4code_gettimeofday
+      func_gl_gnulib_m4code_lstat
+      func_gl_gnulib_m4code_secure_getenv
+      func_gl_gnulib_m4code_sys_stat
+      func_gl_gnulib_m4code_sys_time
+    fi
+  }
+  func_gl_gnulib_m4code_threadlib ()
+  {
+    if ! $gl_gnulib_enabled_threadlib; then
+      gl_THREADLIB
+      gl_gnulib_enabled_threadlib=true
+    fi
+  }
+  func_gl_gnulib_m4code_time ()
+  {
+    if ! $gl_gnulib_enabled_time; then
+      gl_HEADER_TIME_H
+      gl_gnulib_enabled_time=true
+      func_gl_gnulib_m4code_gettimeofday
+    fi
+  }
+  func_gl_gnulib_m4code_vasnprintf ()
+  {
+    if ! $gl_gnulib_enabled_vasnprintf; then
+      gl_FUNC_VASNPRINTF
+      gl_gnulib_enabled_vasnprintf=true
+      func_gl_gnulib_m4code_xsize
+    fi
+  }
+  func_gl_gnulib_m4code_wcrtomb ()
+  {
+    if ! $gl_gnulib_enabled_wcrtomb; then
+      gl_FUNC_WCRTOMB
+      if test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1; then
+        AC_LIBOBJ([wcrtomb])
+        gl_PREREQ_WCRTOMB
+      fi
+      gl_WCHAR_MODULE_INDICATOR([wcrtomb])
+      gl_gnulib_enabled_wcrtomb=true
+    fi
+  }
+  func_gl_gnulib_m4code_xsize ()
+  {
+    if ! $gl_gnulib_enabled_xsize; then
+      gl_XSIZE
+      gl_gnulib_enabled_xsize=true
+      func_gl_gnulib_m4code_size_max
+    fi
+  }
+  if test -n "$ARGZ_H"; then
+    func_gl_gnulib_m4code_mempcpy
+  fi
+  if test -n "$ARGZ_H"; then
+    func_gl_gnulib_m4code_stpcpy
+  fi
+  if test -n "$ARGZ_H"; then
+    func_gl_gnulib_m4code_strndup
+  fi
+  if test -n "$ARGZ_H"; then
+    func_gl_gnulib_m4code_strstr
+  fi
+  if test $ac_cv_lib_error_at_line = no; then
+    func_gl_gnulib_m4code_676220fa4366efa9bdbfccf11a857c07
+  fi
+  if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
+    func_gl_gnulib_m4code_localcharset
+  fi
+  if test $HAVE_MKSTEMP = 0 || test $REPLACE_MKSTEMP = 1; then
+    func_gl_gnulib_m4code_tempname
+  fi
+  if test $ac_use_included_regex = yes; then
+    func_gl_gnulib_m4code_btowc
+  fi
+  if test "$ac_cv_gnu_library_2_1:$ac_use_included_regex" = no:yes; then
+    func_gl_gnulib_m4code_lock
+  fi
+  if test $ac_use_included_regex = yes; then
+    func_gl_gnulib_m4code_nl_langinfo
+  fi
+  if test $ac_use_included_regex = yes; then
+    func_gl_gnulib_m4code_wcrtomb
+  fi
+  if test $ac_cv_func_strdup = no || test $REPLACE_STRDUP = 1; then
+    func_gl_gnulib_m4code_ef455225c00f5049c808c2eda3e76866
+  fi
+  if test $REPLACE_STRERROR = 1; then
+    func_gl_gnulib_m4code_intprops
+  fi
+  if test $REPLACE_STRERROR = 1; then
+    func_gl_gnulib_m4code_dbb57f49352be8fb86869629a254fb72
+  fi
+  if test $HAVE_VASPRINTF = 0 || test $REPLACE_VASPRINTF = 1; then
+    func_gl_gnulib_m4code_vasnprintf
+  fi
+  if test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1; then
+    func_gl_gnulib_m4code_localcharset
+  fi
+  m4_pattern_allow([^gl_GNULIB_ENABLED_])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_btowc], [$gl_gnulib_enabled_btowc])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_configmake], 
[$gl_gnulib_enabled_configmake])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_dosname], [$gl_gnulib_enabled_dosname])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_deb6c5f14b16306a85c59bccf4d416d8], 
[$gl_gnulib_enabled_deb6c5f14b16306a85c59bccf4d416d8])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_gettimeofday], 
[$gl_gnulib_enabled_gettimeofday])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_intprops], [$gl_gnulib_enabled_intprops])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_langinfo], [$gl_gnulib_enabled_langinfo])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_localcharset], 
[$gl_gnulib_enabled_localcharset])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_locale], [$gl_gnulib_enabled_locale])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_localeconv], 
[$gl_gnulib_enabled_localeconv])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_lock], [$gl_gnulib_enabled_lock])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_lstat], [$gl_gnulib_enabled_lstat])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_ef455225c00f5049c808c2eda3e76866], 
[$gl_gnulib_enabled_ef455225c00f5049c808c2eda3e76866])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_mbtowc], [$gl_gnulib_enabled_mbtowc])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_mempcpy], [$gl_gnulib_enabled_mempcpy])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_f691f076f650964c9f5598c3ee487616], 
[$gl_gnulib_enabled_f691f076f650964c9f5598c3ee487616])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_676220fa4366efa9bdbfccf11a857c07], 
[$gl_gnulib_enabled_676220fa4366efa9bdbfccf11a857c07])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_nl_langinfo], 
[$gl_gnulib_enabled_nl_langinfo])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_pathmax], [$gl_gnulib_enabled_pathmax])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_secure_getenv], 
[$gl_gnulib_enabled_secure_getenv])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_size_max], [$gl_gnulib_enabled_size_max])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_stat], [$gl_gnulib_enabled_stat])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_stpcpy], [$gl_gnulib_enabled_stpcpy])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_dbb57f49352be8fb86869629a254fb72], 
[$gl_gnulib_enabled_dbb57f49352be8fb86869629a254fb72])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_strndup], [$gl_gnulib_enabled_strndup])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_strstr], [$gl_gnulib_enabled_strstr])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_f84f170cca5f5b09d22686d5b833aa41], 
[$gl_gnulib_enabled_f84f170cca5f5b09d22686d5b833aa41])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_sys_stat], [$gl_gnulib_enabled_sys_stat])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_sys_time], [$gl_gnulib_enabled_sys_time])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_tempname], [$gl_gnulib_enabled_tempname])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_threadlib], [$gl_gnulib_enabled_threadlib])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_time], [$gl_gnulib_enabled_time])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_vasnprintf], 
[$gl_gnulib_enabled_vasnprintf])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_wcrtomb], [$gl_gnulib_enabled_wcrtomb])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_xsize], [$gl_gnulib_enabled_xsize])
   # End of code from modules
   m4_ifval(gl_LIBSOURCES_LIST, [
     m4_syscmd([test ! -d ]m4_defn([gl_LIBSOURCES_DIR])[ ||
@@ -567,6 +882,7 @@
   AC_SUBST([gltests_WITNESS])
   gl_module_indicator_condition=$gltests_WITNESS
   m4_pushdef([gl_MODULE_INDICATOR_CONDITION], [$gl_module_indicator_condition])
+  m4_pattern_allow([^gl_GNULIB_ENABLED_])
   m4_popdef([gl_MODULE_INDICATOR_CONDITION])
   m4_ifval(gltests_LIBSOURCES_LIST, [
     m4_syscmd([test ! -d ]m4_defn([gltests_LIBSOURCES_DIR])[ ||
@@ -683,9 +999,6 @@
   lib/float+.h
   lib/float.c
   lib/float.in.h
-  lib/fpucw.h
-  lib/frexp.c
-  lib/frexpl.c
   lib/getopt.c
   lib/getopt.in.h
   lib/getopt1.c
@@ -696,13 +1009,6 @@
   lib/glthread/lock.h
   lib/glthread/threadlib.c
   lib/intprops.h
-  lib/isnan.c
-  lib/isnand-nolibm.h
-  lib/isnand.c
-  lib/isnanf-nolibm.h
-  lib/isnanf.c
-  lib/isnanl-nolibm.h
-  lib/isnanl.c
   lib/iswblank.c
   lib/itold.c
   lib/langinfo.in.h
@@ -715,8 +1021,6 @@
   lib/malloca.c
   lib/malloca.h
   lib/malloca.valgrind
-  lib/math.c
-  lib/math.in.h
   lib/mbchar.c
   lib/mbchar.h
   lib/mbiter.c
@@ -748,10 +1052,6 @@
   lib/pathmax.h
   lib/printf-args.c
   lib/printf-args.h
-  lib/printf-frexp.c
-  lib/printf-frexp.h
-  lib/printf-frexpl.c
-  lib/printf-frexpl.h
   lib/printf-parse.c
   lib/printf-parse.h
   lib/ref-add.sin
@@ -763,9 +1063,6 @@
   lib/regex_internal.h
   lib/regexec.c
   lib/secure_getenv.c
-  lib/signbitd.c
-  lib/signbitf.c
-  lib/signbitl.c
   lib/size_max.h
   lib/stat.c
   lib/stdarg.in.h
@@ -830,16 +1127,11 @@
   m4/errno_h.m4
   m4/error.m4
   m4/exponentd.m4
-  m4/exponentf.m4
-  m4/exponentl.m4
   m4/extensions.m4
   m4/extern-inline.m4
   m4/fcntl-o.m4
   m4/fcntl_h.m4
   m4/float_h.m4
-  m4/fpieee.m4
-  m4/frexp.m4
-  m4/frexpl.m4
   m4/getopt.m4
   m4/gettext.m4
   m4/gettimeofday.m4
@@ -856,14 +1148,10 @@
   m4/intmax_t.m4
   m4/inttypes-pri.m4
   m4/inttypes_h.m4
-  m4/isnand.m4
-  m4/isnanf.m4
-  m4/isnanl.m4
   m4/iswblank.m4
   m4/langinfo_h.m4
   m4/largefile.m4
   m4/lcmessage.m4
-  m4/ldexpl.m4
   m4/lib-ld.m4
   m4/lib-link.m4
   m4/lib-prefix.m4
@@ -904,14 +1192,11 @@
   m4/onceonly.m4
   m4/pathmax.m4
   m4/po.m4
-  m4/printf-frexp.m4
-  m4/printf-frexpl.m4
   m4/printf-posix.m4
   m4/printf.m4
   m4/progtest.m4
   m4/regex.m4
   m4/secure_getenv.m4
-  m4/signbit.m4
   m4/size_max.m4
   m4/ssize_t.m4
   m4/stat.m4
@@ -942,7 +1227,6 @@
   m4/uintmax_t.m4
   m4/unistd_h.m4
   m4/vasnprintf.m4
-  m4/vasprintf-posix.m4
   m4/vasprintf.m4
   m4/visibility.m4
   m4/warn-on-use.m4




reply via email to

[Prev in Thread] Current Thread [Next in Thread]