Merge branch 'feature/upstream' into develop

1 files changed, 231 insertions, 206 deletions

diff --git a/tests/Makefile.gnulib b/tests/Makefile.gnulib
index 661e14d..4b3f0ea 100644
--- a/tests/Makefile.gnulib
+++ b/tests/Makefile.gnulib
@@ -4,7 +4,7 @@
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This file is distributed in the hope that it will be useful,
@@ -22,7 +22,7 @@
 #
 # Generated by gnulib-tool.
 
-AUTOMAKE_OPTIONS = 1.11 foreign subdir-objects
+AUTOMAKE_OPTIONS = 1.14 foreign subdir-objects
 
 SUBDIRS = .
 TESTS =
@@ -43,7 +43,7 @@ CLEANFILES =
 DISTCLEANFILES =
 MAINTAINERCLEANFILES =
 
-CFLAGS = @GL_CFLAG_ALLOW_WARNINGS@ @CFLAGS@
+CFLAGS = @GL_CFLAG_ALLOW_WARNINGS@ $(GL_CFLAG_GNULIB_WARNINGS) @CFLAGS@
 CXXFLAGS = @GL_CXXFLAG_ALLOW_WARNINGS@ @CXXFLAGS@
 
 AM_CPPFLAGS = \
@@ -64,10 +64,11 @@ TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)'
 
 ## begin gnulib module accept
 
+if GL_COND_OBJ_ACCEPT
+libtests_a_SOURCES += accept.c
+endif
 
-EXTRA_DIST += accept.c w32sock.h
-
-EXTRA_libtests_a_SOURCES += accept.c
+EXTRA_DIST += w32sock.h
 
 ## end   gnulib module accept
 
@@ -151,6 +152,14 @@ EXTRA_DIST += test-array-mergesort.c macros.h
 
 ## end   gnulib module array-mergesort-tests
 
+## begin gnulib module assert-h-tests
+
+TESTS += test-assert
+check_PROGRAMS += test-assert
+EXTRA_DIST += test-assert.c
+
+## end   gnulib module assert-h-tests
+
 ## begin gnulib module basename-lgpl
 
 libtests_a_SOURCES += basename-lgpl.c
@@ -176,10 +185,11 @@ EXTRA_DIST += test-binary-io.sh test-binary-io.c macros.h
 
 ## begin gnulib module bind
 
+if GL_COND_OBJ_BIND
+libtests_a_SOURCES += bind.c
+endif
 
-EXTRA_DIST += bind.c w32sock.h
-
-EXTRA_libtests_a_SOURCES += bind.c
+EXTRA_DIST += w32sock.h
 
 ## end   gnulib module bind
 
@@ -194,10 +204,9 @@ EXTRA_DIST += test-bind.c signature.h macros.h
 
 ## begin gnulib module btowc
 
-
-EXTRA_DIST += btowc.c
-
-EXTRA_libtests_a_SOURCES += btowc.c
+if GL_COND_OBJ_BTOWC
+libtests_a_SOURCES += btowc.c
+endif
 
 ## end   gnulib module btowc
 
@@ -275,10 +284,9 @@ EXTRA_DIST += test-cloexec.c macros.h
 
 ## begin gnulib module close
 
-
-EXTRA_DIST += close.c
-
-EXTRA_libtests_a_SOURCES += close.c
+if GL_COND_OBJ_CLOSE
+libtests_a_SOURCES += close.c
+endif
 
 ## end   gnulib module close
 
@@ -292,10 +300,11 @@ EXTRA_DIST += test-close.c signature.h macros.h
 
 ## begin gnulib module connect
 
+if GL_COND_OBJ_CONNECT
+libtests_a_SOURCES += connect.c
+endif
 
-EXTRA_DIST += connect.c w32sock.h
-
-EXTRA_libtests_a_SOURCES += connect.c
+EXTRA_DIST += w32sock.h
 
 ## end   gnulib module connect
 
@@ -343,10 +352,9 @@ EXTRA_DIST += test-ctype.c
 
 ## begin gnulib module dup2
 
-
-EXTRA_DIST += dup2.c
-
-EXTRA_libtests_a_SOURCES += dup2.c
+if GL_COND_OBJ_DUP2
+libtests_a_SOURCES += dup2.c
+endif
 
 ## end   gnulib module dup2
 
@@ -378,10 +386,11 @@ EXTRA_DIST += test-errno.c
 
 ## begin gnulib module error
 
+if GL_COND_OBJ_ERROR
+libtests_a_SOURCES += error.c
+endif
 
-EXTRA_DIST += error.c error.h
-
-EXTRA_libtests_a_SOURCES += error.c
+EXTRA_DIST += error.h
 
 ## end   gnulib module error
 
@@ -395,10 +404,9 @@ EXTRA_DIST += exitfail.h
 
 ## begin gnulib module fcntl
 
-
-EXTRA_DIST += fcntl.c
-
-EXTRA_libtests_a_SOURCES += fcntl.c
+if GL_COND_OBJ_FCNTL
+libtests_a_SOURCES += fcntl.c
+endif
 
 ## end   gnulib module fcntl
 
@@ -465,10 +473,9 @@ EXTRA_DIST += fd-hook.h
 
 ## begin gnulib module fdopen
 
-
-EXTRA_DIST += fdopen.c
-
-EXTRA_libtests_a_SOURCES += fdopen.c
+if GL_COND_OBJ_FDOPEN
+libtests_a_SOURCES += fdopen.c
+endif
 
 ## end   gnulib module fdopen
 
@@ -556,10 +563,13 @@ EXTRA_DIST += test-fseterr.c
 
 ## begin gnulib module fstat
 
+if GL_COND_OBJ_FSTAT
+libtests_a_SOURCES += fstat.c
+endif
 
-EXTRA_DIST += fstat.c stat-w32.c stat-w32.h
+EXTRA_DIST += stat-w32.c stat-w32.h
 
-EXTRA_libtests_a_SOURCES += fstat.c stat-w32.c
+EXTRA_libtests_a_SOURCES += stat-w32.c
 
 ## end   gnulib module fstat
 
@@ -573,10 +583,9 @@ EXTRA_DIST += test-fstat.c signature.h macros.h
 
 ## begin gnulib module ftruncate
 
-
-EXTRA_DIST += ftruncate.c
-
-EXTRA_libtests_a_SOURCES += ftruncate.c
+if GL_COND_OBJ_FTRUNCATE
+libtests_a_SOURCES += ftruncate.c
+endif
 
 ## end   gnulib module ftruncate
 
@@ -617,10 +626,9 @@ gl_V_at = $(AM_V_GEN)
 
 ## begin gnulib module getcwd-lgpl
 
-
-EXTRA_DIST += getcwd-lgpl.c
-
-EXTRA_libtests_a_SOURCES += getcwd-lgpl.c
+if GL_COND_OBJ_GETCWD_LGPL
+libtests_a_SOURCES += getcwd-lgpl.c
+endif
 
 ## end   gnulib module getcwd-lgpl
 
@@ -635,10 +643,9 @@ EXTRA_DIST += test-getcwd-lgpl.c signature.h macros.h
 
 ## begin gnulib module getdtablesize
 
-
-EXTRA_DIST += getdtablesize.c
-
-EXTRA_libtests_a_SOURCES += getdtablesize.c
+if GL_COND_OBJ_GETDTABLESIZE
+libtests_a_SOURCES += getdtablesize.c
+endif
 
 ## end   gnulib module getdtablesize
 
@@ -652,10 +659,9 @@ EXTRA_DIST += test-getdtablesize.c signature.h macros.h
 
 ## begin gnulib module getpagesize
 
-
-EXTRA_DIST += getpagesize.c
-
-EXTRA_libtests_a_SOURCES += getpagesize.c
+if GL_COND_OBJ_GETPAGESIZE
+libtests_a_SOURCES += getpagesize.c
+endif
 
 ## end   gnulib module getpagesize
 
@@ -683,10 +689,9 @@ libtests_a_SOURCES += gettext.h
 
 ## begin gnulib module gettimeofday
 
-
-EXTRA_DIST += gettimeofday.c
-
-EXTRA_libtests_a_SOURCES += gettimeofday.c
+if GL_COND_OBJ_GETTIMEOFDAY
+libtests_a_SOURCES += gettimeofday.c
+endif
 
 ## end   gnulib module gettimeofday
 
@@ -764,10 +769,9 @@ EXTRA_DIST += test-ignore-value.c
 
 ## begin gnulib module inet_pton
 
-
-EXTRA_DIST += inet_pton.c
-
-EXTRA_libtests_a_SOURCES += inet_pton.c
+if GL_COND_OBJ_INET_PTON
+libtests_a_SOURCES += inet_pton.c
+endif
 
 ## end   gnulib module inet_pton
 
@@ -780,6 +784,13 @@ EXTRA_DIST += test-inet_pton.c signature.h macros.h
 
 ## end   gnulib module inet_pton-tests
 
+## begin gnulib module intprops
+
+
+EXTRA_DIST += intprops-internal.h intprops.h
+
+## end   gnulib module intprops
+
 ## begin gnulib module intprops-tests
 
 TESTS += test-intprops
@@ -798,10 +809,11 @@ EXTRA_DIST += test-inttypes.c
 
 ## begin gnulib module ioctl
 
+if GL_COND_OBJ_IOCTL
+libtests_a_SOURCES += ioctl.c
+endif
 
-EXTRA_DIST += ioctl.c w32sock.h
-
-EXTRA_libtests_a_SOURCES += ioctl.c
+EXTRA_DIST += w32sock.h
 
 ## end   gnulib module ioctl
 
@@ -815,10 +827,9 @@ EXTRA_DIST += test-ioctl.c signature.h macros.h
 
 ## begin gnulib module isblank
 
-
-EXTRA_DIST += isblank.c
-
-EXTRA_libtests_a_SOURCES += isblank.c
+if GL_COND_OBJ_ISBLANK
+libtests_a_SOURCES += isblank.c
+endif
 
 ## end   gnulib module isblank
 
@@ -911,10 +922,11 @@ EXTRA_DIST += test-limits-h.c
 
 ## begin gnulib module listen
 
+if GL_COND_OBJ_LISTEN
+libtests_a_SOURCES += listen.c
+endif
 
-EXTRA_DIST += listen.c w32sock.h
-
-EXTRA_libtests_a_SOURCES += listen.c
+EXTRA_DIST += w32sock.h
 
 ## end   gnulib module listen
 
@@ -969,10 +981,9 @@ EXTRA_DIST += test-rwlock1.c test-lock.c test-once.c atomic-int-gnulib.h
 
 ## begin gnulib module lstat
 
-
-EXTRA_DIST += lstat.c
-
-EXTRA_libtests_a_SOURCES += lstat.c
+if GL_COND_OBJ_LSTAT
+libtests_a_SOURCES += lstat.c
+endif
 
 ## end   gnulib module lstat
 
@@ -1049,10 +1060,11 @@ EXTRA_DIST += test-mbsinit.sh test-mbsinit.c signature.h macros.h
 
 ## begin gnulib module mbtowc
 
+if GL_COND_OBJ_MBTOWC
+libtests_a_SOURCES += mbtowc.c
+endif
 
-EXTRA_DIST += mbtowc-impl.h mbtowc.c
-
-EXTRA_libtests_a_SOURCES += mbtowc.c
+EXTRA_DIST += mbtowc-impl.h
 
 ## end   gnulib module mbtowc
 
@@ -1066,28 +1078,29 @@ EXTRA_DIST += test-memchr.c zerosize-ptr.h signature.h macros.h
 
 ## begin gnulib module msvc-inval
 
+if GL_COND_OBJ_MSVC_INVAL
+libtests_a_SOURCES += msvc-inval.c
+endif
 
-EXTRA_DIST += msvc-inval.c msvc-inval.h
-
-EXTRA_libtests_a_SOURCES += msvc-inval.c
+EXTRA_DIST += msvc-inval.h
 
 ## end   gnulib module msvc-inval
 
 ## begin gnulib module msvc-nothrow
 
+if GL_COND_OBJ_MSVC_NOTHROW
+libtests_a_SOURCES += msvc-nothrow.c
+endif
 
-EXTRA_DIST += msvc-nothrow.c msvc-nothrow.h
-
-EXTRA_libtests_a_SOURCES += msvc-nothrow.c
+EXTRA_DIST += msvc-nothrow.h
 
 ## end   gnulib module msvc-nothrow
 
 ## begin gnulib module nanosleep
 
-
-EXTRA_DIST += nanosleep.c
-
-EXTRA_libtests_a_SOURCES += nanosleep.c
+if GL_COND_OBJ_NANOSLEEP
+libtests_a_SOURCES += nanosleep.c
+endif
 
 ## end   gnulib module nanosleep
 
@@ -1139,10 +1152,9 @@ EXTRA_DIST += test-netinet_in.c
 
 ## begin gnulib module open
 
-
-EXTRA_DIST += open.c
-
-EXTRA_libtests_a_SOURCES += open.c
+if GL_COND_OBJ_OPEN
+libtests_a_SOURCES += open.c
+endif
 
 ## end   gnulib module open
 
@@ -1171,10 +1183,9 @@ EXTRA_DIST += test-pathmax.c
 
 ## begin gnulib module perror
 
-
-EXTRA_DIST += perror.c
-
-EXTRA_libtests_a_SOURCES += perror.c
+if GL_COND_OBJ_PERROR
+libtests_a_SOURCES += perror.c
+endif
 
 ## end   gnulib module perror
 
@@ -1188,10 +1199,9 @@ EXTRA_DIST += macros.h signature.h test-perror.c test-perror2.c test-perror.sh
 
 ## begin gnulib module pipe-posix
 
-
-EXTRA_DIST += pipe.c
-
-EXTRA_libtests_a_SOURCES += pipe.c
+if GL_COND_OBJ_PIPE
+libtests_a_SOURCES += pipe.c
+endif
 
 ## end   gnulib module pipe-posix
 
@@ -1219,6 +1229,23 @@ EXTRA_DIST += test-printf-frexpl.c macros.h
 
 ## end   gnulib module printf-frexpl-tests
 
+## begin gnulib module pselect
+
+if GL_COND_OBJ_PSELECT
+libtests_a_SOURCES += pselect.c
+endif
+
+## end   gnulib module pselect
+
+## begin gnulib module pselect-tests
+
+TESTS += test-pselect
+check_PROGRAMS += test-pselect
+test_pselect_LDADD = $(LDADD) @LIB_SELECT@ @LIBSOCKET@ @LIB_PTHREAD_SIGMASK@ $(INET_PTON_LIB)
+EXTRA_DIST += test-pselect.c test-select.h macros.h signature.h
+
+## end   gnulib module pselect-tests
+
 ## begin gnulib module pthread-h
 
 BUILT_SOURCES += pthread.h
@@ -1372,10 +1399,9 @@ EXTRA_DIST += test-pthread.c
 
 ## begin gnulib module pthread-thread
 
-
-EXTRA_DIST += pthread-thread.c
-
-EXTRA_libtests_a_SOURCES += pthread-thread.c
+if GL_COND_OBJ_PTHREAD_THREAD
+libtests_a_SOURCES += pthread-thread.c
+endif
 
 ## end   gnulib module pthread-thread
 
@@ -1390,10 +1416,9 @@ EXTRA_DIST += test-pthread-thread.c macros.h
 
 ## begin gnulib module pthread_sigmask
 
-
-EXTRA_DIST += pthread_sigmask.c
-
-EXTRA_libtests_a_SOURCES += pthread_sigmask.c
+if GL_COND_OBJ_PTHREAD_SIGMASK
+libtests_a_SOURCES += pthread_sigmask.c
+endif
 
 ## end   gnulib module pthread_sigmask
 
@@ -1409,19 +1434,17 @@ EXTRA_DIST += test-pthread_sigmask1.c test-pthread_sigmask2.c signature.h macros
 
 ## begin gnulib module putenv
 
-
-EXTRA_DIST += putenv.c
-
-EXTRA_libtests_a_SOURCES += putenv.c
+if GL_COND_OBJ_PUTENV
+libtests_a_SOURCES += putenv.c
+endif
 
 ## end   gnulib module putenv
 
 ## begin gnulib module raise
 
-
-EXTRA_DIST += raise.c
-
-EXTRA_libtests_a_SOURCES += raise.c
+if GL_COND_OBJ_RAISE
+libtests_a_SOURCES += raise.c
+endif
 
 ## end   gnulib module raise
 
@@ -1461,10 +1484,9 @@ EXTRA_libtests_a_SOURCES += realloc.c
 
 ## begin gnulib module reallocarray
 
-
-EXTRA_DIST += reallocarray.c
-
-EXTRA_libtests_a_SOURCES += reallocarray.c
+if GL_COND_OBJ_REALLOCARRAY
+libtests_a_SOURCES += reallocarray.c
+endif
 
 ## end   gnulib module reallocarray
 
@@ -1522,19 +1544,17 @@ EXTRA_DIST += test-sched.c
 
 ## begin gnulib module sched_yield
 
-
-EXTRA_DIST += sched_yield.c
-
-EXTRA_libtests_a_SOURCES += sched_yield.c
+if GL_COND_OBJ_SCHED_YIELD
+libtests_a_SOURCES += sched_yield.c
+endif
 
 ## end   gnulib module sched_yield
 
 ## begin gnulib module select
 
-
-EXTRA_DIST += select.c
-
-EXTRA_libtests_a_SOURCES += select.c
+if GL_COND_OBJ_SELECT
+libtests_a_SOURCES += select.c
+endif
 
 ## end   gnulib module select
 
@@ -1552,10 +1572,9 @@ EXTRA_DIST += macros.h signature.h test-select.c test-select.h test-select-fd.c
 
 ## begin gnulib module setenv
 
-
-EXTRA_DIST += setenv.c
-
-EXTRA_libtests_a_SOURCES += setenv.c
+if GL_COND_OBJ_SETENV
+libtests_a_SOURCES += setenv.c
+endif
 
 ## end   gnulib module setenv
 
@@ -1569,10 +1588,9 @@ EXTRA_DIST += test-setenv.c signature.h macros.h
 
 ## begin gnulib module setlocale
 
-
-EXTRA_DIST += setlocale.c
-
-EXTRA_libtests_a_SOURCES += setlocale.c
+if GL_COND_OBJ_SETLOCALE
+libtests_a_SOURCES += setlocale.c
+endif
 
 ## end   gnulib module setlocale
 
@@ -1610,10 +1628,11 @@ EXTRA_DIST += test-setlocale1.sh test-setlocale1.c test-setlocale2.sh test-setlo
 
 ## begin gnulib module setsockopt
 
+if GL_COND_OBJ_SETSOCKOPT
+libtests_a_SOURCES += setsockopt.c
+endif
 
-EXTRA_DIST += setsockopt.c w32sock.h
-
-EXTRA_libtests_a_SOURCES += setsockopt.c
+EXTRA_DIST += w32sock.h
 
 ## end   gnulib module setsockopt
 
@@ -1626,24 +1645,6 @@ EXTRA_DIST += test-setsockopt.c signature.h macros.h
 
 ## end   gnulib module setsockopt-tests
 
-## begin gnulib module sigaction
-
-libtests_a_SOURCES += sig-handler.c
-
-EXTRA_DIST += sig-handler.h sigaction.c
-
-EXTRA_libtests_a_SOURCES += sigaction.c
-
-## end   gnulib module sigaction
-
-## begin gnulib module sigaction-tests
-
-TESTS += test-sigaction
-check_PROGRAMS += test-sigaction
-EXTRA_DIST += test-sigaction.c signature.h macros.h
-
-## end   gnulib module sigaction-tests
-
 ## begin gnulib module signal-h
 
 BUILT_SOURCES += signal.h
@@ -1703,10 +1704,9 @@ EXTRA_DIST += test-signbit.c minus-zero.h infinity.h macros.h
 
 ## begin gnulib module sigprocmask
 
-
-EXTRA_DIST += sigprocmask.c
-
-EXTRA_libtests_a_SOURCES += sigprocmask.c
+if GL_COND_OBJ_SIGPROCMASK
+libtests_a_SOURCES += sigprocmask.c
+endif
 
 ## end   gnulib module sigprocmask
 
@@ -1720,10 +1720,9 @@ EXTRA_DIST += test-sigprocmask.c signature.h macros.h
 
 ## begin gnulib module sleep
 
-
-EXTRA_DIST += sleep.c
-
-EXTRA_libtests_a_SOURCES += sleep.c
+if GL_COND_OBJ_SLEEP
+libtests_a_SOURCES += sleep.c
+endif
 
 ## end   gnulib module sleep
 
@@ -1785,10 +1784,11 @@ EXTRA_DIST += warn-on-use.h
 
 ## begin gnulib module socket
 
+if GL_COND_OBJ_SOCKET
+libtests_a_SOURCES += socket.c
+endif
 
-EXTRA_DIST += socket.c w32sock.h
-
-EXTRA_libtests_a_SOURCES += socket.c
+EXTRA_DIST += w32sock.h
 
 ## end   gnulib module socket
 
@@ -1811,10 +1811,13 @@ EXTRA_DIST += test-sockets.c
 
 ## begin gnulib module stat
 
+if GL_COND_OBJ_STAT
+libtests_a_SOURCES += stat.c
+endif
 
-EXTRA_DIST += stat-w32.c stat-w32.h stat.c
+EXTRA_DIST += stat-w32.c stat-w32.h
 
-EXTRA_libtests_a_SOURCES += stat-w32.c stat.c
+EXTRA_libtests_a_SOURCES += stat-w32.c
 
 ## end   gnulib module stat
 
@@ -1880,6 +1883,14 @@ EXTRA_DIST += test-stdbool.c
 
 ## end   gnulib module stdbool-tests
 
+## begin gnulib module stdckdint-tests
+
+TESTS += test-stdckdint
+check_PROGRAMS += test-stdckdint
+EXTRA_DIST += macros.h test-intprops.c test-stdckdint.c
+
+## end   gnulib module stdckdint-tests
+
 ## begin gnulib module stddef-tests
 
 TESTS += test-stddef
@@ -2028,6 +2039,13 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
 	$(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += stdio.h stdio.h-t
 
+if GL_COND_OBJ_STDIO_READ
+libtests_a_SOURCES += stdio-read.c
+endif
+if GL_COND_OBJ_STDIO_WRITE
+libtests_a_SOURCES += stdio-write.c
+endif
+
 EXTRA_DIST += stdio.in.h
 
 ## end   gnulib module stdio
@@ -2050,19 +2068,19 @@ EXTRA_DIST += test-stdlib.c test-sys_wait.h
 
 ## begin gnulib module strerror
 
-
-EXTRA_DIST += strerror.c
-
-EXTRA_libtests_a_SOURCES += strerror.c
+if GL_COND_OBJ_STRERROR
+libtests_a_SOURCES += strerror.c
+endif
 
 ## end   gnulib module strerror
 
 ## begin gnulib module strerror-override
 
+if GL_COND_OBJ_STRERROR_OVERRIDE
+libtests_a_SOURCES += strerror-override.c
+endif
 
-EXTRA_DIST += strerror-override.c strerror-override.h
-
-EXTRA_libtests_a_SOURCES += strerror-override.c
+EXTRA_DIST += strerror-override.h
 
 ## end   gnulib module strerror-override
 
@@ -2138,10 +2156,9 @@ EXTRA_DIST += test-strstr.c zerosize-ptr.h signature.h macros.h
 
 ## begin gnulib module symlink
 
-
-EXTRA_DIST += symlink.c
-
-EXTRA_libtests_a_SOURCES += symlink.c
+if GL_COND_OBJ_SYMLINK
+libtests_a_SOURCES += symlink.c
+endif
 
 ## end   gnulib module symlink
 
@@ -2305,6 +2322,7 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU
 	      -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \
 	      -e 's|@''WINDOWS_64_BIT_ST_SIZE''@|$(WINDOWS_64_BIT_ST_SIZE)|g' \
 	      -e 's|@''WINDOWS_STAT_TIMESPEC''@|$(WINDOWS_STAT_TIMESPEC)|g' \
+	      -e 's/@''GNULIB_CHMOD''@/$(GL_GNULIB_CHMOD)/g' \
 	      -e 's/@''GNULIB_FCHMODAT''@/$(GL_GNULIB_FCHMODAT)/g' \
 	      -e 's/@''GNULIB_FSTAT''@/$(GL_GNULIB_FSTAT)/g' \
 	      -e 's/@''GNULIB_FSTATAT''@/$(GL_GNULIB_FSTATAT)/g' \
@@ -2336,6 +2354,7 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU
 	      -e 's|@''HAVE_MKNOD''@|$(HAVE_MKNOD)|g' \
 	      -e 's|@''HAVE_MKNODAT''@|$(HAVE_MKNODAT)|g' \
 	      -e 's|@''HAVE_UTIMENSAT''@|$(HAVE_UTIMENSAT)|g' \
+	      -e 's|@''REPLACE_CHMOD''@|$(REPLACE_CHMOD)|g' \
 	      -e 's|@''REPLACE_FCHMODAT''@|$(REPLACE_FCHMODAT)|g' \
 	      -e 's|@''REPLACE_FSTAT''@|$(REPLACE_FSTAT)|g' \
 	      -e 's|@''REPLACE_FSTATAT''@|$(REPLACE_FSTATAT)|g' \
@@ -6736,10 +6755,9 @@ EXTRA_DIST += uniwidth/test-uc_width.c uniwidth/test-uc_width2.c uniwidth/test-u
 
 ## begin gnulib module unsetenv
 
-
-EXTRA_DIST += unsetenv.c
-
-EXTRA_libtests_a_SOURCES += unsetenv.c
+if GL_COND_OBJ_UNSETENV
+libtests_a_SOURCES += unsetenv.c
+endif
 
 ## end   gnulib module unsetenv
 
@@ -6753,10 +6771,9 @@ EXTRA_DIST += test-unsetenv.c signature.h macros.h
 
 ## begin gnulib module usleep
 
-
-EXTRA_DIST += usleep.c
-
-EXTRA_libtests_a_SOURCES += usleep.c
+if GL_COND_OBJ_USLEEP
+libtests_a_SOURCES += usleep.c
+endif
 
 ## end   gnulib module usleep
 
@@ -6768,6 +6785,13 @@ EXTRA_DIST += test-usleep.c signature.h macros.h
 
 ## end   gnulib module usleep-tests
 
+## begin gnulib module verify
+
+
+EXTRA_DIST += verify.h
+
+## end   gnulib module verify
+
 ## begin gnulib module verify-tests
 
 TESTS_ENVIRONMENT += MAKE='$(MAKE)'
@@ -6795,10 +6819,9 @@ EXTRA_DIST += test-wchar.c
 
 ## begin gnulib module wcrtomb
 
-
-EXTRA_DIST += wcrtomb.c
-
-EXTRA_libtests_a_SOURCES += wcrtomb.c
+if GL_COND_OBJ_WCRTOMB
+libtests_a_SOURCES += wcrtomb.c
+endif
 
 ## end   gnulib module wcrtomb
 
@@ -6822,19 +6845,19 @@ EXTRA_DIST += test-wcrtomb.sh test-wcrtomb.c test-wcrtomb-w32-1.sh test-wcrtomb-
 
 ## begin gnulib module wctob
 
-
-EXTRA_DIST += wctob.c
-
-EXTRA_libtests_a_SOURCES += wctob.c
+if GL_COND_OBJ_WCTOB
+libtests_a_SOURCES += wctob.c
+endif
 
 ## end   gnulib module wctob
 
 ## begin gnulib module wctomb
 
+if GL_COND_OBJ_WCTOMB
+libtests_a_SOURCES += wctomb.c
+endif
 
-EXTRA_DIST += wctomb-impl.h wctomb.c
-
-EXTRA_libtests_a_SOURCES += wctomb.c
+EXTRA_DIST += wctomb-impl.h
 
 ## end   gnulib module wctomb
 
@@ -6857,19 +6880,21 @@ EXTRA_DIST += test-wcwidth.c signature.h macros.h
 
 ## begin gnulib module windows-thread
 
+if GL_COND_OBJ_WINDOWS_THREAD
+libtests_a_SOURCES += windows-thread.c
+endif
 
-EXTRA_DIST += windows-thread.c windows-thread.h
-
-EXTRA_libtests_a_SOURCES += windows-thread.c
+EXTRA_DIST += windows-thread.h
 
 ## end   gnulib module windows-thread
 
 ## begin gnulib module windows-tls
 
+if GL_COND_OBJ_WINDOWS_TLS
+libtests_a_SOURCES += windows-tls.c
+endif
 
-EXTRA_DIST += windows-tls.c windows-tls.h
-
-EXTRA_libtests_a_SOURCES += windows-tls.c
+EXTRA_DIST += windows-tls.h
 
 ## end   gnulib module windows-tls