summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/accept2
-rw-r--r--modules/acosl6
-rw-r--r--modules/alloca-opt7
-rw-r--r--modules/allocator22
-rw-r--r--modules/areadlink5
-rw-r--r--modules/areadlinkat2
-rw-r--r--modules/areadlinkat-tests1
-rw-r--r--modules/argmatch2
-rw-r--r--modules/argz19
-rw-r--r--modules/arpa_inet2
-rw-r--r--modules/asinl4
-rw-r--r--modules/assert-h47
-rw-r--r--modules/atanl4
-rw-r--r--modules/atoll2
-rw-r--r--modules/binary-io2
-rw-r--r--modules/bind2
-rw-r--r--modules/btowc2
-rw-r--r--modules/byteswap7
-rw-r--r--modules/canonicalize-lgpl16
-rw-r--r--modules/careadlinkat27
-rw-r--r--modules/ceil2
-rw-r--r--modules/ceilf2
-rw-r--r--modules/ceill2
-rw-r--r--modules/chdir-long18
-rw-r--r--modules/chown8
-rw-r--r--modules/close2
-rw-r--r--modules/close-hook23
-rw-r--r--modules/connect2
-rw-r--r--modules/copy-file2
-rw-r--r--modules/cosl10
-rw-r--r--modules/ctype2
-rw-r--r--modules/dirent2
-rw-r--r--modules/dirent-safer-tests3
-rw-r--r--modules/dirfd2
-rw-r--r--modules/dprintf6
-rw-r--r--modules/dprintf-posix18
-rw-r--r--modules/dup21
-rw-r--r--modules/dup2-obsolete (renamed from modules/exit)10
-rw-r--r--modules/errno7
-rw-r--r--modules/error4
-rw-r--r--modules/euidaccess6
-rw-r--r--modules/execute2
-rw-r--r--modules/exitfail2
-rw-r--r--modules/expl6
-rw-r--r--modules/faccessat6
-rw-r--r--modules/fchdir30
-rw-r--r--modules/fchdir-tests3
-rw-r--r--modules/fclose4
-rw-r--r--modules/fclose-tests10
-rw-r--r--modules/fcntl4
-rw-r--r--modules/fcntl-h3
-rw-r--r--modules/fd-hook23
-rw-r--r--modules/fdopendir8
-rw-r--r--modules/fdopendir-tests1
-rw-r--r--modules/fdutimensat-tests2
-rw-r--r--modules/fflush15
-rw-r--r--modules/filenamecat-lgpl2
-rw-r--r--modules/float7
-rw-r--r--modules/floor2
-rw-r--r--modules/floorf2
-rw-r--r--modules/floorl2
-rw-r--r--modules/fnmatch23
-rw-r--r--modules/fopen2
-rw-r--r--modules/fprintf-posix20
-rw-r--r--modules/freading3
-rw-r--r--modules/frexp2
-rw-r--r--modules/frexp-nolibm2
-rw-r--r--modules/frexpl4
-rw-r--r--modules/frexpl-nolibm4
-rw-r--r--modules/fseek2
-rw-r--r--modules/fsusage2
-rw-r--r--modules/ftell2
-rw-r--r--modules/ftello4
-rw-r--r--modules/full-read2
-rw-r--r--modules/futimens4
-rw-r--r--modules/getcwd17
-rw-r--r--modules/getcwd-lgpl25
-rw-r--r--modules/getcwd-lgpl-tests12
-rw-r--r--modules/getcwd-tests6
-rw-r--r--modules/getdelim8
-rw-r--r--modules/getdomainname4
-rw-r--r--modules/getgroups6
-rw-r--r--modules/gethostname6
-rw-r--r--modules/getline4
-rw-r--r--modules/getlogin_r4
-rw-r--r--modules/getopt-posix4
-rw-r--r--modules/getpeername2
-rw-r--r--modules/getsockname2
-rw-r--r--modules/getsockopt4
-rw-r--r--modules/getsubopt6
-rw-r--r--modules/gettext3
-rw-r--r--modules/getusershell4
-rw-r--r--modules/git-merge-changelog1
-rw-r--r--modules/glob31
-rw-r--r--modules/gnumakefile4
-rw-r--r--modules/grantpt6
-rw-r--r--modules/hash4
-rw-r--r--modules/hash-tests2
-rw-r--r--modules/iconv-h7
-rw-r--r--modules/iconv_open4
-rw-r--r--modules/iconv_open-utf6
-rw-r--r--modules/imaxabs2
-rw-r--r--modules/imaxdiv2
-rw-r--r--modules/inet_ntop6
-rw-r--r--modules/inet_pton8
-rw-r--r--modules/inttypes8
-rw-r--r--modules/inttypes-incomplete62
-rw-r--r--modules/ioctl5
-rw-r--r--modules/isapipe6
-rw-r--r--modules/isfinite8
-rw-r--r--modules/isinf2
-rw-r--r--modules/langinfo2
-rw-r--r--modules/lchown10
-rw-r--r--modules/ldexpl4
-rw-r--r--modules/link6
-rw-r--r--modules/linkat33
-rw-r--r--modules/linkat-tests5
-rw-r--r--modules/listen2
-rw-r--r--modules/locale2
-rw-r--r--modules/logl8
-rw-r--r--modules/long-options1
-rw-r--r--modules/lstat4
-rw-r--r--modules/math2
-rw-r--r--modules/mbrlen2
-rw-r--r--modules/mbrtowc8
-rw-r--r--modules/mbsinit4
-rw-r--r--modules/mbsnrtowcs8
-rw-r--r--modules/mbsrtowcs4
-rw-r--r--modules/mbtowc4
-rw-r--r--modules/memchr1
-rw-r--r--modules/memchr-obsolete28
-rw-r--r--modules/memcmp2
-rw-r--r--modules/mgetgroups2
-rw-r--r--modules/mkdir2
-rw-r--r--modules/mkdtemp4
-rw-r--r--modules/mkfifo2
-rw-r--r--modules/mkfifoat8
-rw-r--r--modules/mkfifoat-tests1
-rw-r--r--modules/mknod4
-rw-r--r--modules/mkostemp4
-rw-r--r--modules/mkostemps4
-rw-r--r--modules/mkstemp4
-rw-r--r--modules/mkstemps4
-rw-r--r--modules/mktime2
-rw-r--r--modules/nanosleep18
-rw-r--r--modules/netdb5
-rw-r--r--modules/netdb-c++-tests19
-rw-r--r--modules/netdb-tests1
-rw-r--r--modules/netinet_in7
-rw-r--r--modules/nonblocking19
-rw-r--r--modules/nonblocking-pipe-tests34
-rw-r--r--modules/nonblocking-socket-tests46
-rw-r--r--modules/nonblocking-tests5
-rw-r--r--modules/obstack2
-rw-r--r--modules/open2
-rw-r--r--modules/openat8
-rw-r--r--modules/openat-safer-tests1
-rw-r--r--modules/openat-tests5
-rw-r--r--modules/pagealign_alloc2
-rw-r--r--modules/passfd6
-rw-r--r--modules/passfd-tests2
-rw-r--r--modules/perror4
-rw-r--r--modules/pipe-filter-gi3
-rw-r--r--modules/pipe-filter-ii3
-rw-r--r--modules/pipe23
-rw-r--r--modules/pipe2-tests1
-rw-r--r--modules/poll10
-rw-r--r--modules/poll-h2
-rw-r--r--modules/popen2
-rw-r--r--modules/posix_spawn3
-rw-r--r--modules/posix_spawn_file_actions_addclose3
-rw-r--r--modules/posix_spawn_file_actions_adddup23
-rw-r--r--modules/posix_spawn_file_actions_addopen3
-rw-r--r--modules/posix_spawn_file_actions_destroy1
-rw-r--r--modules/posix_spawn_file_actions_init1
-rw-r--r--modules/posix_spawnattr_destroy1
-rw-r--r--modules/posix_spawnattr_getflags1
-rw-r--r--modules/posix_spawnattr_getpgroup1
-rw-r--r--modules/posix_spawnattr_getschedparam1
-rw-r--r--modules/posix_spawnattr_getschedpolicy1
-rw-r--r--modules/posix_spawnattr_getsigdefault1
-rw-r--r--modules/posix_spawnattr_getsigmask1
-rw-r--r--modules/posix_spawnattr_init1
-rw-r--r--modules/posix_spawnattr_setflags1
-rw-r--r--modules/posix_spawnattr_setpgroup1
-rw-r--r--modules/posix_spawnattr_setschedparam1
-rw-r--r--modules/posix_spawnattr_setschedpolicy1
-rw-r--r--modules/posix_spawnattr_setsigdefault1
-rw-r--r--modules/posix_spawnattr_setsigmask1
-rw-r--r--modules/posix_spawnp3
-rw-r--r--modules/pread5
-rw-r--r--modules/printf-posix2
-rw-r--r--modules/pt_chown1
-rw-r--r--modules/pthread7
-rw-r--r--modules/ptsname2
-rw-r--r--modules/pty2
-rw-r--r--modules/putenv2
-rw-r--r--modules/pwrite5
-rw-r--r--modules/read24
-rw-r--r--modules/readline2
-rw-r--r--modules/readlink2
-rw-r--r--modules/readlinkat6
-rw-r--r--modules/readlinkat-tests1
-rw-r--r--modules/readme-release31
-rw-r--r--modules/recv2
-rw-r--r--modules/recvfrom4
-rw-r--r--modules/regex30
-rw-r--r--modules/relocatable-prog-wrapper4
-rw-r--r--modules/remove4
-rw-r--r--modules/rename14
-rw-r--r--modules/renameat13
-rw-r--r--modules/renameat-tests2
-rw-r--r--modules/rmdir4
-rw-r--r--modules/round4
-rw-r--r--modules/roundf2
-rw-r--r--modules/roundl2
-rw-r--r--modules/rpmatch8
-rw-r--r--modules/safe-read1
-rw-r--r--modules/safe-write4
-rw-r--r--modules/save-cwd2
-rw-r--r--modules/savewd2
-rw-r--r--modules/sched7
-rw-r--r--modules/search2
-rw-r--r--modules/select4
-rw-r--r--modules/selinux-h9
-rw-r--r--modules/send2
-rw-r--r--modules/sendto2
-rw-r--r--modules/setenv8
-rw-r--r--modules/setlocale2
-rw-r--r--modules/setsockopt4
-rw-r--r--modules/shutdown2
-rw-r--r--modules/sigaction2
-rw-r--r--modules/signal4
-rw-r--r--modules/signbit12
-rw-r--r--modules/sigprocmask4
-rw-r--r--modules/sinl10
-rw-r--r--modules/sleep4
-rw-r--r--modules/snprintf4
-rw-r--r--modules/snprintf-posix18
-rw-r--r--modules/socket4
-rw-r--r--modules/sockets2
-rw-r--r--modules/spawn2
-rw-r--r--modules/spawn-pipe2
-rw-r--r--modules/sprintf-posix22
-rw-r--r--modules/sqrtl12
-rw-r--r--modules/stat4
-rw-r--r--modules/stdarg7
-rw-r--r--modules/stdbool7
-rw-r--r--modules/stddef7
-rw-r--r--modules/stdint7
-rw-r--r--modules/stdint-tests1
-rw-r--r--modules/stdio14
-rw-r--r--modules/stdlib2
-rw-r--r--modules/strcase6
-rw-r--r--modules/strchrnul4
-rw-r--r--modules/strdup-posix2
-rw-r--r--modules/strerror4
-rw-r--r--modules/strerror_r-posix6
-rw-r--r--modules/strftime-tests1
-rw-r--r--modules/string3
-rw-r--r--modules/strings2
-rw-r--r--modules/strndup4
-rw-r--r--modules/strnlen4
-rw-r--r--modules/strptime12
-rw-r--r--modules/strsep4
-rw-r--r--modules/strsignal10
-rw-r--r--modules/strstr-simple6
-rw-r--r--modules/strtod5
-rw-r--r--modules/strtod-obsolete28
-rw-r--r--modules/strtoimax10
-rw-r--r--modules/strtok_r2
-rw-r--r--modules/strtol8
-rw-r--r--modules/strtoll3
-rw-r--r--modules/strtoul9
-rw-r--r--modules/strtoull4
-rw-r--r--modules/strtoumax11
-rw-r--r--modules/symlink2
-rw-r--r--modules/symlinkat6
-rw-r--r--modules/symlinkat-tests1
-rw-r--r--modules/sys_file2
-rw-r--r--modules/sys_ioctl2
-rw-r--r--modules/sys_select2
-rw-r--r--modules/sys_socket3
-rw-r--r--modules/sys_stat2
-rw-r--r--modules/sys_time2
-rw-r--r--modules/sys_times2
-rw-r--r--modules/sys_uio42
-rw-r--r--modules/sys_uio-tests10
-rw-r--r--modules/sys_utsname2
-rw-r--r--modules/sys_wait2
-rw-r--r--modules/sysexits8
-rw-r--r--modules/tanl10
-rw-r--r--modules/tcgetsid2
-rw-r--r--modules/termios2
-rw-r--r--modules/time2
-rw-r--r--modules/tmpfile8
-rw-r--r--modules/trunc2
-rw-r--r--modules/truncf2
-rw-r--r--modules/truncl2
-rw-r--r--modules/tzset2
-rw-r--r--modules/uname2
-rw-r--r--modules/unistd5
-rw-r--r--modules/unlink4
-rw-r--r--modules/unlockpt2
-rw-r--r--modules/unsetenv4
-rw-r--r--modules/usleep4
-rw-r--r--modules/utimecmp1
-rw-r--r--modules/utimensat4
-rw-r--r--modules/utimensat-tests2
-rw-r--r--modules/vasprintf6
-rw-r--r--modules/vdprintf6
-rw-r--r--modules/vdprintf-posix18
-rw-r--r--modules/vfprintf-posix22
-rw-r--r--modules/vfscanf21
-rw-r--r--modules/vprintf-posix2
-rw-r--r--modules/vscanf21
-rw-r--r--modules/vsnprintf4
-rw-r--r--modules/vsnprintf-posix18
-rw-r--r--modules/vsprintf-posix22
-rw-r--r--modules/wait-process2
-rw-r--r--modules/wchar2
-rw-r--r--modules/wcrtomb4
-rw-r--r--modules/wcscasecmp2
-rw-r--r--modules/wcscspn4
-rw-r--r--modules/wcsdup4
-rw-r--r--modules/wcsncasecmp2
-rw-r--r--modules/wcsnrtombs4
-rw-r--r--modules/wcspbrk2
-rw-r--r--modules/wcsrtombs4
-rw-r--r--modules/wcsspn2
-rw-r--r--modules/wcsstr2
-rw-r--r--modules/wcstok4
-rw-r--r--modules/wcswidth2
-rw-r--r--modules/wctob2
-rw-r--r--modules/wctomb4
-rw-r--r--modules/wctype2
-rw-r--r--modules/wctype-h2
-rw-r--r--modules/wcwidth10
-rw-r--r--modules/write2
-rw-r--r--modules/xalloc1
-rw-r--r--modules/xalloc-oversized20
-rw-r--r--modules/xgetgroups25
-rw-r--r--modules/xsetenv2
-rw-r--r--modules/xstrtol2
344 files changed, 1429 insertions, 742 deletions
diff --git a/modules/accept b/modules/accept
index d1c954edbf..fb46f98a89 100644
--- a/modules/accept
+++ b/modules/accept
@@ -7,7 +7,7 @@ lib/w32sock.h
Depends-on:
sys_socket
-errno
+errno [test "$ac_cv_header_winsock2_h" = yes]
configure.ac:
AC_REQUIRE([gl_HEADER_SYS_SOCKET])
diff --git a/modules/acosl b/modules/acosl
index 3c49196f35..0726070617 100644
--- a/modules/acosl
+++ b/modules/acosl
@@ -8,8 +8,8 @@ m4/acosl.m4
Depends-on:
math
extensions
-asinl
-sqrtl
+asinl [test $HAVE_ACOSL = 0]
+sqrtl [test $HAVE_ACOSL = 0]
configure.ac:
gl_FUNC_ACOSL
@@ -24,7 +24,7 @@ Link:
$(ACOSL_LIBM)
License:
-GPL
+LGPL
Maintainer:
Paolo Bonzini
diff --git a/modules/alloca-opt b/modules/alloca-opt
index 4ae08b0dd8..1f3f2dba05 100644
--- a/modules/alloca-opt
+++ b/modules/alloca-opt
@@ -20,12 +20,17 @@ BUILT_SOURCES += $(ALLOCA_H)
# We need the following in order to create <alloca.h> when the system
# doesn't have one that works with the given compiler.
-alloca.h: alloca.in.h
+if GL_GENERATE_ALLOCA_H
+alloca.h: alloca.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/alloca.in.h; \
} > $@-t && \
mv -f $@-t $@
+else
+alloca.h: $(top_builddir)/config.status
+ rm -f $@
+endif
MOSTLYCLEANFILES += alloca.h alloca.h-t
Include:
diff --git a/modules/allocator b/modules/allocator
new file mode 100644
index 0000000000..6ff55526c4
--- /dev/null
+++ b/modules/allocator
@@ -0,0 +1,22 @@
+Description:
+Storage allocators.
+
+Files:
+lib/allocator.h
+lib/allocator.c
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+lib_SOURCES += allocator.c
+
+Include:
+"allocator.h"
+
+License:
+LGPLv2+
+
+Maintainer:
+all
diff --git a/modules/areadlink b/modules/areadlink
index 316626994f..daf02325a7 100644
--- a/modules/areadlink
+++ b/modules/areadlink
@@ -6,10 +6,7 @@ lib/areadlink.h
lib/areadlink.c
Depends-on:
-readlink
-ssize_t
-stdint
-unistd
+careadlinkat
configure.ac:
diff --git a/modules/areadlinkat b/modules/areadlinkat
index 072f823bef..8c621d5757 100644
--- a/modules/areadlinkat
+++ b/modules/areadlinkat
@@ -7,7 +7,7 @@ lib/areadlinkat.c
Depends-on:
areadlink
-stdint
+careadlinkat
readlinkat
configure.ac:
diff --git a/modules/areadlinkat-tests b/modules/areadlinkat-tests
index 422ac61412..23e5278486 100644
--- a/modules/areadlinkat-tests
+++ b/modules/areadlinkat-tests
@@ -13,4 +13,3 @@ configure.ac:
Makefile.am:
TESTS += test-areadlinkat
check_PROGRAMS += test-areadlinkat
-test_areadlinkat_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/argmatch b/modules/argmatch
index 0dd643cdfb..c3225976d6 100644
--- a/modules/argmatch
+++ b/modules/argmatch
@@ -11,10 +11,10 @@ gettext-h
error
quotearg
quote
-exit
exitfail
verify
stdbool
+stdlib
memcmp
configure.ac:
diff --git a/modules/argz b/modules/argz
index 1a33f37d40..652243e2e5 100644
--- a/modules/argz
+++ b/modules/argz
@@ -7,12 +7,12 @@ lib/argz.c
m4/argz.m4
Depends-on:
-memmove
-mempcpy
-stpcpy
-strndup
-strnlen
-strstr
+memmove [test -n "$ARGZ_H"]
+mempcpy [test -n "$ARGZ_H"]
+stpcpy [test -n "$ARGZ_H"]
+strndup [test -n "$ARGZ_H"]
+strnlen [test -n "$ARGZ_H"]
+strstr [test -n "$ARGZ_H"]
configure.ac:
gl_FUNC_ARGZ
@@ -25,12 +25,17 @@ BUILT_SOURCES += $(ARGZ_H)
# We need the following in order to create <argz.h> when the system
# doesn't have one that works with the given compiler.
-argz.h: argz.in.h
+if GL_GENERATE_ARGZ_H
+argz.h: argz.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/argz.in.h; \
} > $@-t && \
mv -f $@-t $@
+else
+argz.h: $(top_builddir)/config.status
+ rm -f $@
+endif
MOSTLYCLEANFILES += argz.h argz.h-t
Include:
diff --git a/modules/arpa_inet b/modules/arpa_inet
index 35c2167a57..92d67aa036 100644
--- a/modules/arpa_inet
+++ b/modules/arpa_inet
@@ -23,7 +23,7 @@ BUILT_SOURCES += arpa/inet.h
# We need the following in order to create <arpa/inet.h> when the system
# doesn't have one.
-arpa/inet.h: arpa_inet.in.h $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H)
+arpa/inet.h: arpa_inet.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H)
$(AM_V_at)$(MKDIR_P) arpa
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
diff --git a/modules/asinl b/modules/asinl
index 7f254ab461..19e049c2ac 100644
--- a/modules/asinl
+++ b/modules/asinl
@@ -8,7 +8,7 @@ m4/asinl.m4
Depends-on:
math
extensions
-sqrtl
+sqrtl [test $HAVE_ASINL = 0]
configure.ac:
gl_FUNC_ASINL
@@ -23,7 +23,7 @@ Link:
$(ASINL_LIBM)
License:
-GPL
+LGPL
Maintainer:
Paolo Bonzini
diff --git a/modules/assert-h b/modules/assert-h
new file mode 100644
index 0000000000..50bd9f83e1
--- /dev/null
+++ b/modules/assert-h
@@ -0,0 +1,47 @@
+Description:
+An <assert.h> that conforms to C1X.
+
+Files:
+lib/assert.in.h
+lib/verify.h
+m4/assert_h.m4
+
+Depends-on:
+include_next
+
+configure.ac:
+gl_ASSERT_H
+
+Makefile.am:
+BUILT_SOURCES += $(ASSERT_H)
+
+# We need the following in order to create <assert.h> when the system
+# doesn't have one that works with the given compiler.
+if GL_GENERATE_ASSERT_H
+assert.h: assert.in.h verify.h $(top_builddir)/config.status
+ $(AM_V_GEN)rm -f $@-t $@ && \
+ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+ -e 's|@''NEXT_ASSERT_H''@|$(NEXT_ASSERT_H)|g' \
+ < $(srcdir)/assert.in.h && \
+ sed -e 's|_gl_verify|_gl_static_assert|g' \
+ -e 's|_GL_VERIFY|_GL_STATIC_ASSERT|g' \
+ < $(srcdir)/verify.h; \
+ } > $@-t && \
+ mv $@-t $@
+else
+assert.h: $(top_builddir)/config.status
+ rm -f $@
+endif
+MOSTLYCLEANFILES += assert.h assert.h-t
+
+Include:
+<assert.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+Paul Eggert
diff --git a/modules/atanl b/modules/atanl
index f6ba1b85a9..4f3f9eab64 100644
--- a/modules/atanl
+++ b/modules/atanl
@@ -8,7 +8,7 @@ m4/atanl.m4
Depends-on:
math
extensions
-isnanl
+isnanl [test $HAVE_ATANL = 0]
configure.ac:
gl_FUNC_ATANL
@@ -23,7 +23,7 @@ Link:
$(ATANL_LIBM)
License:
-GPL
+LGPL
Maintainer:
Paolo Bonzini
diff --git a/modules/atoll b/modules/atoll
index 5f0571293e..d979a008f2 100644
--- a/modules/atoll
+++ b/modules/atoll
@@ -7,7 +7,7 @@ m4/atoll.m4
m4/longlong.m4
Depends-on:
-strtoll
+strtoll [test $HAVE_ATOLL = 0]
configure.ac:
gl_FUNC_ATOLL
diff --git a/modules/binary-io b/modules/binary-io
index eb41ec0a3c..4386ec924d 100644
--- a/modules/binary-io
+++ b/modules/binary-io
@@ -16,7 +16,7 @@ Include:
"binary-io.h"
License:
-LGPL
+LGPLv2+
Maintainer:
Bruno Haible
diff --git a/modules/bind b/modules/bind
index 050f0e65c7..5c4595ffda 100644
--- a/modules/bind
+++ b/modules/bind
@@ -7,7 +7,7 @@ lib/w32sock.h
Depends-on:
sys_socket
-errno
+errno [test "$ac_cv_header_winsock2_h" = yes]
configure.ac:
AC_REQUIRE([gl_HEADER_SYS_SOCKET])
diff --git a/modules/btowc b/modules/btowc
index 10c5f3f9a5..1566a2fa71 100644
--- a/modules/btowc
+++ b/modules/btowc
@@ -8,7 +8,7 @@ m4/locale-fr.m4
Depends-on:
wchar
-mbtowc
+mbtowc [test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1]
configure.ac:
gl_FUNC_BTOWC
diff --git a/modules/byteswap b/modules/byteswap
index d16af57f6a..760df6e614 100644
--- a/modules/byteswap
+++ b/modules/byteswap
@@ -18,12 +18,17 @@ BUILT_SOURCES += $(BYTESWAP_H)
# We need the following in order to create <byteswap.h> when the system
# doesn't have one.
-byteswap.h: byteswap.in.h
+if GL_GENERATE_BYTESWAP_H
+byteswap.h: byteswap.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/byteswap.in.h; \
} > $@-t && \
mv -f $@-t $@
+else
+byteswap.h: $(top_builddir)/config.status
+ rm -f $@
+endif
MOSTLYCLEANFILES += byteswap.h byteswap.h-t
Include:
diff --git a/modules/canonicalize-lgpl b/modules/canonicalize-lgpl
index 6a748f3000..1fb23c29f3 100644
--- a/modules/canonicalize-lgpl
+++ b/modules/canonicalize-lgpl
@@ -7,16 +7,16 @@ m4/canonicalize.m4
m4/double-slash-root.m4
Depends-on:
-alloca-opt
-errno
extensions
-lstat
-malloca
-memmove
-pathmax
-readlink
stdlib
-sys_stat
+alloca-opt [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
+errno [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
+lstat [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
+malloca [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
+memmove [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
+pathmax [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
+readlink [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
+sys_stat [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
configure.ac:
gl_CANONICALIZE_LGPL
diff --git a/modules/careadlinkat b/modules/careadlinkat
new file mode 100644
index 0000000000..b4bc4a4dfb
--- /dev/null
+++ b/modules/careadlinkat
@@ -0,0 +1,27 @@
+Description:
+Read symbolic links into a buffer without size limitation, relative to fd.
+
+Files:
+lib/careadlinkat.c
+lib/careadlinkat.h
+
+Depends-on:
+allocator
+readlink
+ssize_t
+unistd
+
+configure.ac:
+AC_CHECK_FUNCS_ONCE([readlinkat])
+
+Makefile.am:
+lib_SOURCES += careadlinkat.c
+
+Include:
+"careadlinkat.h"
+
+License:
+LGPLv2+
+
+Maintainer:
+Paul Eggert, Bruno Haible, Jim Meyering
diff --git a/modules/ceil b/modules/ceil
index 90e03fce2c..1a3a5de496 100644
--- a/modules/ceil
+++ b/modules/ceil
@@ -7,7 +7,7 @@ m4/ceil.m4
Depends-on:
math
-float
+float [test $REPLACE_CEIL = 1]
configure.ac:
gl_FUNC_CEIL
diff --git a/modules/ceilf b/modules/ceilf
index 3c0082c783..beba067aea 100644
--- a/modules/ceilf
+++ b/modules/ceilf
@@ -9,7 +9,7 @@ m4/ceilf.m4
Depends-on:
math
extensions
-float
+float [test $HAVE_DECL_CEILF = 0 || test $REPLACE_CEILF = 1]
configure.ac:
gl_FUNC_CEILF
diff --git a/modules/ceill b/modules/ceill
index a2365c272b..51d5b92bc5 100644
--- a/modules/ceill
+++ b/modules/ceill
@@ -9,7 +9,7 @@ m4/ceill.m4
Depends-on:
math
extensions
-float
+float [test $HAVE_DECL_CEILL = 0 || test $REPLACE_CEILL = 1]
configure.ac:
gl_FUNC_CEILL
diff --git a/modules/chdir-long b/modules/chdir-long
index 4025b45afc..0c8e7926ef 100644
--- a/modules/chdir-long
+++ b/modules/chdir-long
@@ -7,14 +7,16 @@ lib/chdir-long.c
m4/chdir-long.m4
Depends-on:
-atexit
-fchdir
-fcntl-h
-openat
-memchr
-mempcpy
-memrchr
-stdbool
+unistd
+atexit [test $gl_cv_have_arbitrary_file_name_length_limit = yes]
+fchdir [test $gl_cv_have_arbitrary_file_name_length_limit = yes]
+fcntl-h [test $gl_cv_have_arbitrary_file_name_length_limit = yes]
+openat [test $gl_cv_have_arbitrary_file_name_length_limit = yes]
+memchr [test $gl_cv_have_arbitrary_file_name_length_limit = yes]
+mempcpy [test $gl_cv_have_arbitrary_file_name_length_limit = yes]
+memrchr [test $gl_cv_have_arbitrary_file_name_length_limit = yes]
+stdbool [test $gl_cv_have_arbitrary_file_name_length_limit = yes]
+stdlib [test $gl_cv_have_arbitrary_file_name_length_limit = yes]
configure.ac:
gl_FUNC_CHDIR_LONG
diff --git a/modules/chown b/modules/chown
index 94bff841c7..ccfeb3bcdd 100644
--- a/modules/chown
+++ b/modules/chown
@@ -7,11 +7,11 @@ lib/fchown-stub.c
m4/chown.m4
Depends-on:
-open
-stat
-stdbool
-sys_stat
unistd
+open [test $HAVE_CHOWN = 0 || test $REPLACE_CHOWN = 1]
+stat [test $HAVE_CHOWN = 0 || test $REPLACE_CHOWN = 1]
+stdbool [test $HAVE_CHOWN = 0 || test $REPLACE_CHOWN = 1]
+sys_stat [test $HAVE_CHOWN = 0 || test $REPLACE_CHOWN = 1]
configure.ac:
gl_FUNC_CHOWN
diff --git a/modules/close b/modules/close
index e294292b02..cbfa08059f 100644
--- a/modules/close
+++ b/modules/close
@@ -7,7 +7,7 @@ m4/close.m4
Depends-on:
unistd
-close-hook
+fd-hook [test $REPLACE_CLOSE = 1]
fclose
configure.ac:
diff --git a/modules/close-hook b/modules/close-hook
deleted file mode 100644
index ae32ad0530..0000000000
--- a/modules/close-hook
+++ /dev/null
@@ -1,23 +0,0 @@
-Description:
-Hook for making close() extensible.
-
-Files:
-lib/close-hook.h
-lib/close-hook.c
-
-Depends-on:
-unistd
-
-configure.ac:
-
-Makefile.am:
-lib_SOURCES += close-hook.c
-
-Include:
-"close-hook.h"
-
-License:
-LGPLv2+
-
-Maintainer:
-Bruno Haible
diff --git a/modules/connect b/modules/connect
index 1381ffaf91..c90f094382 100644
--- a/modules/connect
+++ b/modules/connect
@@ -7,7 +7,7 @@ lib/w32sock.h
Depends-on:
sys_socket
-errno
+errno [test "$ac_cv_header_winsock2_h" = yes]
configure.ac:
AC_REQUIRE([gl_HEADER_SYS_SOCKET])
diff --git a/modules/copy-file b/modules/copy-file
index 6941e5a8e4..4ca553e302 100644
--- a/modules/copy-file
+++ b/modules/copy-file
@@ -10,11 +10,11 @@ Depends-on:
acl
binary-io
error
-exit
full-write
gettext-h
open
safe-read
+stdlib
unistd
xalloc
diff --git a/modules/cosl b/modules/cosl
index 88ebf9c40e..391a841837 100644
--- a/modules/cosl
+++ b/modules/cosl
@@ -11,10 +11,10 @@ m4/cosl.m4
Depends-on:
math
extensions
-float
-isnanl
-floor
-floorl
+float [test $HAVE_COSL = 0]
+isnanl [test $HAVE_COSL = 0]
+floor [test $HAVE_COSL = 0]
+floorl [test $HAVE_COSL = 0]
configure.ac:
gl_FUNC_COSL
@@ -29,7 +29,7 @@ Link:
$(ACOSL_LIBM)
License:
-GPL
+LGPL
Maintainer:
Paolo Bonzini
diff --git a/modules/ctype b/modules/ctype
index e37e622c64..722adf9b46 100644
--- a/modules/ctype
+++ b/modules/ctype
@@ -20,7 +20,7 @@ BUILT_SOURCES += ctype.h
# We need the following in order to create <ctype.h> when the system
# doesn't have one that works with the given compiler.
-ctype.h: ctype.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
+ctype.h: ctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
diff --git a/modules/dirent b/modules/dirent
index 094a84e2b6..624d080684 100644
--- a/modules/dirent
+++ b/modules/dirent
@@ -22,7 +22,7 @@ BUILT_SOURCES += dirent.h
# We need the following in order to create <dirent.h> when the system
# doesn't have one that works with the given compiler.
-dirent.h: dirent.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+dirent.h: dirent.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
diff --git a/modules/dirent-safer-tests b/modules/dirent-safer-tests
index 172c662de4..2bc95933fd 100644
--- a/modules/dirent-safer-tests
+++ b/modules/dirent-safer-tests
@@ -10,6 +10,3 @@ configure.ac:
Makefile.am:
TESTS += test-dirent-safer
check_PROGRAMS += test-dirent-safer
-# Link with libintl when needed. dirent-safer uses fdopendir if it is present,
-# and fdopendir indirectly depends on xgetcwd -> xalloc-die -> gettext-h.
-test_dirent_safer_LDADD = $(LDADD) $(LIBINTL)
diff --git a/modules/dirfd b/modules/dirfd
index 42ff4d7a0f..8410f38d72 100644
--- a/modules/dirfd
+++ b/modules/dirfd
@@ -7,8 +7,8 @@ m4/dirfd.m4
Depends-on:
dirent
-errno
extensions
+errno [test $ac_cv_have_decl_dirfd = no || test $REPLACE_DIRFD = 1]
configure.ac:
gl_FUNC_DIRFD
diff --git a/modules/dprintf b/modules/dprintf
index 6ebbde4c0a..8c08def360 100644
--- a/modules/dprintf
+++ b/modules/dprintf
@@ -7,9 +7,9 @@ m4/dprintf.m4
Depends-on:
stdio
-vasnprintf
-full-write
-errno
+vasnprintf [test $ac_cv_func_dprintf = no || test $REPLACE_DPRINTF = 1]
+full-write [test $ac_cv_func_dprintf = no || test $REPLACE_DPRINTF = 1]
+errno [test $ac_cv_func_dprintf = no || test $REPLACE_DPRINTF = 1]
configure.ac:
gl_FUNC_DPRINTF
diff --git a/modules/dprintf-posix b/modules/dprintf-posix
index 19a471807e..2423d61628 100644
--- a/modules/dprintf-posix
+++ b/modules/dprintf-posix
@@ -14,18 +14,18 @@ m4/printf.m4
Depends-on:
dprintf
-vasnprintf
-isnand-nolibm
-isnanl-nolibm
-frexp-nolibm
-frexpl-nolibm
-printf-frexp
-printf-frexpl
-signbit
-fpucw
nocrash
printf-safe
multiarch
+vasnprintf [test $ac_cv_func_dprintf = no || test $REPLACE_DPRINTF = 1]
+isnand-nolibm [test $ac_cv_func_dprintf = no || test $REPLACE_DPRINTF = 1]
+isnanl-nolibm [test $ac_cv_func_dprintf = no || test $REPLACE_DPRINTF = 1]
+frexp-nolibm [test $ac_cv_func_dprintf = no || test $REPLACE_DPRINTF = 1]
+frexpl-nolibm [test $ac_cv_func_dprintf = no || test $REPLACE_DPRINTF = 1]
+printf-frexp [test $ac_cv_func_dprintf = no || test $REPLACE_DPRINTF = 1]
+printf-frexpl [test $ac_cv_func_dprintf = no || test $REPLACE_DPRINTF = 1]
+signbit [test $ac_cv_func_dprintf = no || test $REPLACE_DPRINTF = 1]
+fpucw [test $ac_cv_func_dprintf = no || test $REPLACE_DPRINTF = 1]
configure.ac:
gl_FUNC_DPRINTF_POSIX
diff --git a/modules/dup2 b/modules/dup2
index cea1a974b5..17cafd1c6a 100644
--- a/modules/dup2
+++ b/modules/dup2
@@ -7,6 +7,7 @@ m4/dup2.m4
Depends-on:
unistd
+dup2-obsolete
configure.ac:
gl_FUNC_DUP2
diff --git a/modules/exit b/modules/dup2-obsolete
index 18899f28c3..ba71bb97cf 100644
--- a/modules/exit
+++ b/modules/dup2-obsolete
@@ -1,23 +1,25 @@
Description:
-exit() function: program termination.
+dup2() function for old platforms.
Status:
obsolete
Notice:
-This module is obsolete. It will be removed on 2011-01-01. Use 'stdlib'.
+This module is obsolete.
Files:
+m4/dup2-obsolete.m4
Depends-on:
-stdlib
+dup2
configure.ac:
+gl_FUNC_DUP2_OBSOLETE
Makefile.am:
Include:
-<stdlib.h>
+<unistd.h>
License:
LGPLv2+
diff --git a/modules/errno b/modules/errno
index 221bebf0de..d44f377557 100644
--- a/modules/errno
+++ b/modules/errno
@@ -19,7 +19,8 @@ BUILT_SOURCES += $(ERRNO_H)
# We need the following in order to create <errno.h> when the system
# doesn't have one that is POSIX compliant.
-errno.h: errno.in.h
+if GL_GENERATE_ERRNO_H
+errno.h: errno.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@@ -35,6 +36,10 @@ errno.h: errno.in.h
< $(srcdir)/errno.in.h; \
} > $@-t && \
mv $@-t $@
+else
+errno.h: $(top_builddir)/config.status
+ rm -f $@
+endif
MOSTLYCLEANFILES += errno.h errno.h-t
Include:
diff --git a/modules/error b/modules/error
index 7d43aba1cc..a1ec1e953f 100644
--- a/modules/error
+++ b/modules/error
@@ -12,8 +12,8 @@ lib/error.c
m4/error.m4
Depends-on:
-strerror
-unistd
+strerror [test $ac_cv_lib_error_at_line = no]
+unistd [test $ac_cv_lib_error_at_line = no]
configure.ac:
gl_ERROR
diff --git a/modules/euidaccess b/modules/euidaccess
index 93333f5e8e..56bcf28f1b 100644
--- a/modules/euidaccess
+++ b/modules/euidaccess
@@ -8,9 +8,9 @@ m4/euidaccess.m4
Depends-on:
unistd
extensions
-group-member
-stat
-sys_stat
+group-member [test $HAVE_EUIDACCESS = 0]
+stat [test $HAVE_EUIDACCESS = 0]
+sys_stat [test $HAVE_EUIDACCESS = 0]
configure.ac:
gl_FUNC_EUIDACCESS
diff --git a/modules/execute b/modules/execute
index 755e3e5b6d..a65696bb53 100644
--- a/modules/execute
+++ b/modules/execute
@@ -11,7 +11,6 @@ Depends-on:
cloexec
dup2
error
-exit
fatal-signal
wait-process
gettext-h
@@ -25,6 +24,7 @@ posix_spawnattr_setsigmask
posix_spawnattr_setflags
posix_spawnattr_destroy
stdbool
+stdlib
strpbrk
unistd
environ
diff --git a/modules/exitfail b/modules/exitfail
index 641f99d1be..0dd3ec6897 100644
--- a/modules/exitfail
+++ b/modules/exitfail
@@ -6,7 +6,7 @@ lib/exitfail.h
lib/exitfail.c
Depends-on:
-exit
+stdlib
configure.ac:
diff --git a/modules/expl b/modules/expl
index 3870440e75..a0ccf88448 100644
--- a/modules/expl
+++ b/modules/expl
@@ -8,8 +8,8 @@ m4/expl.m4
Depends-on:
math
extensions
-float
-floorl
+float [test $HAVE_EXPL = 0]
+floorl [test $HAVE_EXPL = 0]
configure.ac:
gl_FUNC_EXPL
@@ -24,7 +24,7 @@ Link:
$(EXPL_LIBM)
License:
-GPL
+LGPL
Maintainer:
Paolo Bonzini
diff --git a/modules/faccessat b/modules/faccessat
index 92d818556b..ce8fa0d892 100644
--- a/modules/faccessat
+++ b/modules/faccessat
@@ -6,11 +6,11 @@ lib/faccessat.c
m4/faccessat.m4
Depends-on:
-euidaccess
+unistd
extensions
fcntl-h
-openat
-unistd
+euidaccess [test $HAVE_FACCESSAT = 0]
+openat [test $HAVE_FACCESSAT = 0]
configure.ac:
gl_FUNC_FACCESSAT
diff --git a/modules/fchdir b/modules/fchdir
index 46b481fd14..7b7cb043b5 100644
--- a/modules/fchdir
+++ b/modules/fchdir
@@ -6,21 +6,23 @@ lib/fchdir.c
m4/fchdir.m4
Depends-on:
-close
-dirent
-dirfd
-dup2
-fcntl
-fcntl-h
-include_next
-malloc-posix
-open
-realloc-posix
-stat
-stdbool
-strdup-posix
-sys_stat
unistd
+close [test $HAVE_FCHDIR = 0]
+dirent [test $HAVE_FCHDIR = 0]
+dirfd [test $HAVE_FCHDIR = 0]
+dosname [test $HAVE_FCHDIR = 0]
+dup2 [test $HAVE_FCHDIR = 0]
+fcntl [test $HAVE_FCHDIR = 0]
+fcntl-h [test $HAVE_FCHDIR = 0]
+filenamecat-lgpl [test $HAVE_FCHDIR = 0]
+getcwd-lgpl [test $HAVE_FCHDIR = 0]
+malloc-posix [test $HAVE_FCHDIR = 0]
+open [test $HAVE_FCHDIR = 0]
+realloc-posix [test $HAVE_FCHDIR = 0]
+stat [test $HAVE_FCHDIR = 0]
+stdbool [test $HAVE_FCHDIR = 0]
+strdup-posix [test $HAVE_FCHDIR = 0]
+sys_stat [test $HAVE_FCHDIR = 0]
configure.ac:
gl_FUNC_FCHDIR
diff --git a/modules/fchdir-tests b/modules/fchdir-tests
index 462e709211..8f82dcee43 100644
--- a/modules/fchdir-tests
+++ b/modules/fchdir-tests
@@ -4,7 +4,8 @@ tests/signature.h
tests/macros.h
Depends-on:
-getcwd
+cloexec
+getcwd-lgpl
configure.ac:
diff --git a/modules/fclose b/modules/fclose
index 4f6f786910..ac383aa24b 100644
--- a/modules/fclose
+++ b/modules/fclose
@@ -7,7 +7,9 @@ m4/fclose.m4
Depends-on:
stdio
-close
+close [test $REPLACE_FCLOSE = 1]
+freading [test $REPLACE_FCLOSE = 1]
+lseek [test $REPLACE_FCLOSE = 1]
configure.ac:
gl_FUNC_FCLOSE
diff --git a/modules/fclose-tests b/modules/fclose-tests
new file mode 100644
index 0000000000..6334f6594a
--- /dev/null
+++ b/modules/fclose-tests
@@ -0,0 +1,10 @@
+Files:
+tests/test-fclose.c
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-fclose
+check_PROGRAMS += test-fclose
diff --git a/modules/fcntl b/modules/fcntl
index 67630f9f01..855ee9f974 100644
--- a/modules/fcntl
+++ b/modules/fcntl
@@ -6,10 +6,10 @@ m4/fcntl.m4
lib/fcntl.c
Depends-on:
-dup2
fcntl-h
-getdtablesize
extensions
+dup2 [test $HAVE_FCNTL = 0 || test $REPLACE_FCNTL = 1]
+getdtablesize [test $HAVE_FCNTL = 0 || test $REPLACE_FCNTL = 1]
configure.ac:
gl_FUNC_FCNTL
diff --git a/modules/fcntl-h b/modules/fcntl-h
index 6a33fc7ac0..f244de04de 100644
--- a/modules/fcntl-h
+++ b/modules/fcntl-h
@@ -24,7 +24,7 @@ BUILT_SOURCES += fcntl.h
# We need the following in order to create <fcntl.h> when the system
# doesn't have one that works with the given compiler.
-fcntl.h: fcntl.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@@ -32,6 +32,7 @@ fcntl.h: fcntl.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_FCNTL_H''@|$(NEXT_FCNTL_H)|g' \
-e 's|@''GNULIB_FCNTL''@|$(GNULIB_FCNTL)|g' \
+ -e 's|@''GNULIB_NONBLOCKING''@|$(GNULIB_NONBLOCKING)|g' \
-e 's|@''GNULIB_OPEN''@|$(GNULIB_OPEN)|g' \
-e 's|@''GNULIB_OPENAT''@|$(GNULIB_OPENAT)|g' \
-e 's|@''HAVE_FCNTL''@|$(HAVE_FCNTL)|g' \
diff --git a/modules/fd-hook b/modules/fd-hook
new file mode 100644
index 0000000000..7127083763
--- /dev/null
+++ b/modules/fd-hook
@@ -0,0 +1,23 @@
+Description:
+Hook for making file descriptor functions (close(), ioctl()) extensible.
+
+Files:
+lib/fd-hook.h
+lib/fd-hook.c
+
+Depends-on:
+unistd
+
+configure.ac:
+
+Makefile.am:
+lib_SOURCES += fd-hook.c
+
+Include:
+"fd-hook.h"
+
+License:
+LGPLv2+
+
+Maintainer:
+Bruno Haible
diff --git a/modules/fdopendir b/modules/fdopendir
index 203f6c72d1..0612b74d68 100644
--- a/modules/fdopendir
+++ b/modules/fdopendir
@@ -9,11 +9,11 @@ m4/fdopendir.m4
Depends-on:
dirent
-errno
extensions
-fchdir
-openat-die
-save-cwd
+errno [test $HAVE_FDOPENDIR = 0 || test $REPLACE_FDOPENDIR = 1]
+fchdir [test $HAVE_FDOPENDIR = 0 || test $REPLACE_FDOPENDIR = 1]
+openat-die [test $HAVE_FDOPENDIR = 0 || test $REPLACE_FDOPENDIR = 1]
+save-cwd [test $HAVE_FDOPENDIR = 0 || test $REPLACE_FDOPENDIR = 1]
configure.ac:
gl_FUNC_FDOPENDIR
diff --git a/modules/fdopendir-tests b/modules/fdopendir-tests
index bee2df7df5..39575ba3f0 100644
--- a/modules/fdopendir-tests
+++ b/modules/fdopendir-tests
@@ -12,4 +12,3 @@ configure.ac:
Makefile.am:
TESTS += test-fdopendir
check_PROGRAMS += test-fdopendir
-test_fdopendir_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/fdutimensat-tests b/modules/fdutimensat-tests
index 48ea78d233..1d107ce5c1 100644
--- a/modules/fdutimensat-tests
+++ b/modules/fdutimensat-tests
@@ -19,4 +19,4 @@ configure.ac:
Makefile.am:
TESTS += test-fdutimensat
check_PROGRAMS += test-fdutimensat
-test_fdutimensat_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) @LIBINTL@
+test_fdutimensat_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
diff --git a/modules/fflush b/modules/fflush
index a8a151e93a..f1d696bd3d 100644
--- a/modules/fflush
+++ b/modules/fflush
@@ -7,19 +7,20 @@ lib/stdio-impl.h
m4/fflush.m4
Depends-on:
-fpurge
-ftello
-freading
-lseek
stdio
-unistd
-fseeko
+fpurge [test $REPLACE_FFLUSH = 1]
+ftello [test $REPLACE_FFLUSH = 1]
+freading [test $REPLACE_FFLUSH = 1]
+lseek [test $REPLACE_FFLUSH = 1]
+unistd [test $REPLACE_FFLUSH = 1]
+fseeko [test $REPLACE_FFLUSH = 1]
configure.ac-early:
AC_REQUIRE([AC_FUNC_FSEEKO])
configure.ac:
gl_FUNC_FFLUSH
+gl_MODULE_INDICATOR([fflush])
gl_STDIO_MODULE_INDICATOR([fflush])
Makefile.am:
@@ -28,7 +29,7 @@ Include:
<stdio.h>
License:
-GPL
+LGPL
Maintainer:
Eric Blake
diff --git a/modules/filenamecat-lgpl b/modules/filenamecat-lgpl
index a7449334d2..4dd39933b1 100644
--- a/modules/filenamecat-lgpl
+++ b/modules/filenamecat-lgpl
@@ -18,7 +18,7 @@ Include:
"filenamecat.h"
License:
-GPL
+LGPLv2+
Maintainer:
Jim Meyering
diff --git a/modules/float b/modules/float
index 004d2bf42a..6073c3fa3e 100644
--- a/modules/float
+++ b/modules/float
@@ -19,7 +19,8 @@ BUILT_SOURCES += $(FLOAT_H)
# We need the following in order to create <float.h> when the system
# doesn't have one that works with the given compiler.
-float.h: float.in.h
+if GL_GENERATE_FLOAT_H
+float.h: float.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@@ -29,6 +30,10 @@ float.h: float.in.h
< $(srcdir)/float.in.h; \
} > $@-t && \
mv $@-t $@
+else
+float.h: $(top_builddir)/config.status
+ rm -f $@
+endif
MOSTLYCLEANFILES += float.h float.h-t
Include:
diff --git a/modules/floor b/modules/floor
index ee898d3cd6..1393dadad4 100644
--- a/modules/floor
+++ b/modules/floor
@@ -7,7 +7,7 @@ m4/floor.m4
Depends-on:
math
-float
+float [test $REPLACE_FLOOR = 1]
configure.ac:
gl_FUNC_FLOOR
diff --git a/modules/floorf b/modules/floorf
index 47b9d5ca24..1f9d9da595 100644
--- a/modules/floorf
+++ b/modules/floorf
@@ -9,7 +9,7 @@ m4/floorf.m4
Depends-on:
math
extensions
-float
+float [test $HAVE_DECL_FLOORF = 0 || test $REPLACE_FLOORF = 1]
configure.ac:
gl_FUNC_FLOORF
diff --git a/modules/floorl b/modules/floorl
index 66c13621ad..e21199335e 100644
--- a/modules/floorl
+++ b/modules/floorl
@@ -9,7 +9,7 @@ m4/floorl.m4
Depends-on:
math
extensions
-float
+float [test $HAVE_DECL_FLOORL = 0 || test $REPLACE_FLOORL = 1]
configure.ac:
gl_FUNC_FLOORL
diff --git a/modules/fnmatch b/modules/fnmatch
index 3703192b22..a10b0398ba 100644
--- a/modules/fnmatch
+++ b/modules/fnmatch
@@ -11,14 +11,14 @@ m4/fnmatch.m4
Depends-on:
arg-nonnull
extensions
-alloca
-stdbool
-wchar
-wctype-h
-memchr
-memcmp
-mbsrtowcs
-mbsinit
+alloca [test -n "$FNMATCH_H"]
+stdbool [test -n "$FNMATCH_H"]
+wchar [test -n "$FNMATCH_H"]
+wctype-h [test -n "$FNMATCH_H"]
+memchr [test -n "$FNMATCH_H"]
+memcmp [test -n "$FNMATCH_H"]
+mbsrtowcs [test -n "$FNMATCH_H"]
+mbsinit [test -n "$FNMATCH_H"]
configure.ac:
gl_FUNC_FNMATCH_POSIX
@@ -31,13 +31,18 @@ BUILT_SOURCES += $(FNMATCH_H)
# We need the following in order to create <fnmatch.h> when the system
# doesn't have one that supports the required API.
-fnmatch.h: fnmatch.in.h $(ARG_NONNULL_H)
+if GL_GENERATE_FNMATCH_H
+fnmatch.h: fnmatch.in.h $(top_builddir)/config.status $(ARG_NONNULL_H)
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
< $(srcdir)/fnmatch.in.h; \
} > $@-t && \
mv -f $@-t $@
+else
+fnmatch.h: $(top_builddir)/config.status
+ rm -f $@
+endif
MOSTLYCLEANFILES += fnmatch.h fnmatch.h-t
Include:
diff --git a/modules/fopen b/modules/fopen
index eddd7f650c..2177a3bf95 100644
--- a/modules/fopen
+++ b/modules/fopen
@@ -7,7 +7,7 @@ m4/fopen.m4
Depends-on:
stdio
-unistd
+unistd [test $REPLACE_FOPEN = 1]
configure.ac:
gl_FUNC_FOPEN
diff --git a/modules/fprintf-posix b/modules/fprintf-posix
index be2b010dd8..47e76c5c50 100644
--- a/modules/fprintf-posix
+++ b/modules/fprintf-posix
@@ -14,20 +14,20 @@ m4/printf.m4
Depends-on:
stdio
-fseterr
-vasnprintf
-isnand-nolibm
-isnanl-nolibm
-frexp-nolibm
-frexpl-nolibm
-printf-frexp
-printf-frexpl
-signbit
-fpucw
nocrash
printf-safe
errno
multiarch
+fseterr [test $REPLACE_FPRINTF = 1]
+vasnprintf [test $REPLACE_FPRINTF = 1]
+isnand-nolibm [test $REPLACE_FPRINTF = 1]
+isnanl-nolibm [test $REPLACE_FPRINTF = 1]
+frexp-nolibm [test $REPLACE_FPRINTF = 1]
+frexpl-nolibm [test $REPLACE_FPRINTF = 1]
+printf-frexp [test $REPLACE_FPRINTF = 1]
+printf-frexpl [test $REPLACE_FPRINTF = 1]
+signbit [test $REPLACE_FPRINTF = 1]
+fpucw [test $REPLACE_FPRINTF = 1]
configure.ac:
gl_FUNC_FPRINTF_POSIX
diff --git a/modules/freading b/modules/freading
index d2a027801e..b5c00c65d2 100644
--- a/modules/freading
+++ b/modules/freading
@@ -20,8 +20,7 @@ Include:
"freading.h"
License:
-LGPL
+LGPLv2+
Maintainer:
Eric Blake
-
diff --git a/modules/frexp b/modules/frexp
index 7fae366dbe..3ada9b2f29 100644
--- a/modules/frexp
+++ b/modules/frexp
@@ -7,7 +7,7 @@ m4/frexp.m4
Depends-on:
math
-isnand-nolibm
+isnand-nolibm [test $gl_func_frexp != yes]
configure.ac:
gl_FUNC_FREXP
diff --git a/modules/frexp-nolibm b/modules/frexp-nolibm
index 6a909e972f..34eb958a99 100644
--- a/modules/frexp-nolibm
+++ b/modules/frexp-nolibm
@@ -7,7 +7,7 @@ m4/frexp.m4
Depends-on:
math
-isnand-nolibm
+isnand-nolibm [test $gl_func_frexp_no_libm != yes]
configure.ac:
gl_FUNC_FREXP_NO_LIBM
diff --git a/modules/frexpl b/modules/frexpl
index 185d54dde2..d1f0159b63 100644
--- a/modules/frexpl
+++ b/modules/frexpl
@@ -8,8 +8,8 @@ m4/frexpl.m4
Depends-on:
math
-isnanl-nolibm
-fpucw
+isnanl-nolibm [test $HAVE_DECL_FREXPL = 0 || test $gl_func_frexpl = no]
+fpucw [test $HAVE_DECL_FREXPL = 0 || test $gl_func_frexpl = no]
configure.ac:
gl_FUNC_FREXPL
diff --git a/modules/frexpl-nolibm b/modules/frexpl-nolibm
index 80ce8fb701..dbe1a82820 100644
--- a/modules/frexpl-nolibm
+++ b/modules/frexpl-nolibm
@@ -9,8 +9,8 @@ m4/frexpl.m4
Depends-on:
math
-isnanl-nolibm
-fpucw
+isnanl-nolibm [test $HAVE_DECL_FREXPL = 0 || test $gl_func_frexpl_no_libm = no]
+fpucw [test $HAVE_DECL_FREXPL = 0 || test $gl_func_frexpl_no_libm = no]
configure.ac:
gl_FUNC_FREXPL_NO_LIBM
diff --git a/modules/fseek b/modules/fseek
index 07f948e8e1..98c6d3f57f 100644
--- a/modules/fseek
+++ b/modules/fseek
@@ -6,8 +6,8 @@ lib/fseek.c
m4/fseek.m4
Depends-on:
-fseeko
stdio
+fseeko [test $REPLACE_FSEEK = 1]
configure.ac:
gl_FUNC_FSEEK
diff --git a/modules/fsusage b/modules/fsusage
index c8496880bd..cdefb60cf2 100644
--- a/modules/fsusage
+++ b/modules/fsusage
@@ -7,9 +7,9 @@ lib/fsusage.c
m4/fsusage.m4
Depends-on:
-full-read
stdbool
stdint
+full-read [test $gl_cv_fs_space = yes]
configure.ac:
gl_FSUSAGE
diff --git a/modules/ftell b/modules/ftell
index 6e9dc25965..cc95d169f0 100644
--- a/modules/ftell
+++ b/modules/ftell
@@ -6,9 +6,9 @@ lib/ftell.c
m4/ftell.m4
Depends-on:
-ftello
stdio
errno
+ftello [test $REPLACE_FTELL = 1]
configure.ac:
gl_FUNC_FTELL
diff --git a/modules/ftello b/modules/ftello
index 0cf160c981..b042e84808 100644
--- a/modules/ftello
+++ b/modules/ftello
@@ -8,9 +8,9 @@ m4/fseeko.m4
m4/ftello.m4
Depends-on:
-extensions
-lseek
stdio
+extensions
+lseek [test $HAVE_FTELLO = 0 || test $REPLACE_FTELLO = 1]
configure.ac-early:
AC_REQUIRE([AC_FUNC_FSEEKO])
diff --git a/modules/full-read b/modules/full-read
index d559911c07..5bae3ae5e2 100644
--- a/modules/full-read
+++ b/modules/full-read
@@ -4,10 +4,10 @@ An interface to the read() function that reads all it is asked to read.
Files:
lib/full-read.h
lib/full-read.c
+lib/full-write.c
Depends-on:
safe-read
-full-write
configure.ac:
diff --git a/modules/futimens b/modules/futimens
index 17bff44a0a..4ed403e946 100644
--- a/modules/futimens
+++ b/modules/futimens
@@ -7,8 +7,8 @@ m4/futimens.m4
Depends-on:
sys_stat
-utimens
extensions
+utimens [test $HAVE_FUTIMENS = 0 || test $REPLACE_FUTIMENS = 1]
configure.ac:
gl_FUNC_FUTIMENS
@@ -23,7 +23,7 @@ Link:
$(LIB_CLOCK_GETTIME)
License:
-GPL
+LGPL
Maintainer:
Eric Blake
diff --git a/modules/getcwd b/modules/getcwd
index 108f14b28a..cc80bfe882 100644
--- a/modules/getcwd
+++ b/modules/getcwd
@@ -8,18 +8,19 @@ m4/getcwd-path-max.m4
m4/getcwd.m4
Depends-on:
-mempcpy
-d-ino
-extensions
-memmove
-openat
-stdbool
unistd
-malloc-posix
-strdup-posix
+extensions
+mempcpy [test $REPLACE_GETCWD = 1]
+d-ino [test $REPLACE_GETCWD = 1]
+memmove [test $REPLACE_GETCWD = 1]
+openat [test $REPLACE_GETCWD = 1]
+stdbool [test $REPLACE_GETCWD = 1]
+malloc-posix [test $REPLACE_GETCWD = 1]
+strdup-posix [test $REPLACE_GETCWD = 1]
configure.ac:
gl_FUNC_GETCWD
+gl_MODULE_INDICATOR([getcwd])
gl_UNISTD_MODULE_INDICATOR([getcwd])
Makefile.am:
diff --git a/modules/getcwd-lgpl b/modules/getcwd-lgpl
new file mode 100644
index 0000000000..72e6a7fc08
--- /dev/null
+++ b/modules/getcwd-lgpl
@@ -0,0 +1,25 @@
+Description:
+Ensure getcwd(NULL, 0) returns a buffer allocated by malloc().
+
+Files:
+lib/getcwd-lgpl.c
+m4/getcwd.m4
+
+Depends-on:
+unistd
+strdup [test $REPLACE_GETCWD = 1]
+
+configure.ac:
+gl_FUNC_GETCWD_LGPL
+gl_UNISTD_MODULE_INDICATOR([getcwd])
+
+Makefile.am:
+
+Include:
+<unistd.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+Eric Blake
diff --git a/modules/getcwd-lgpl-tests b/modules/getcwd-lgpl-tests
new file mode 100644
index 0000000000..07fdf73d5c
--- /dev/null
+++ b/modules/getcwd-lgpl-tests
@@ -0,0 +1,12 @@
+Files:
+tests/test-getcwd-lgpl.c
+tests/signature.h
+tests/macros.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-getcwd-lgpl
+check_PROGRAMS += test-getcwd-lgpl
diff --git a/modules/getcwd-tests b/modules/getcwd-tests
index 016961fc71..2187acc75f 100644
--- a/modules/getcwd-tests
+++ b/modules/getcwd-tests
@@ -1,9 +1,11 @@
Files:
tests/test-getcwd.c
-tests/signature.h
-tests/macros.h
Depends-on:
+errno
+fcntl-h
+getcwd-lgpl
+sys_stat
configure.ac:
diff --git a/modules/getdelim b/modules/getdelim
index 0f17b608fa..c3ef317a11 100644
--- a/modules/getdelim
+++ b/modules/getdelim
@@ -6,11 +6,11 @@ lib/getdelim.c
m4/getdelim.m4
Depends-on:
-extensions
stdio
-stdint
-realloc-posix
-errno
+extensions
+stdint [test $HAVE_DECL_GETDELIM = 0 || test $REPLACE_GETDELIM = 1]
+realloc-posix [test $HAVE_DECL_GETDELIM = 0 || test $REPLACE_GETDELIM = 1]
+errno [test $HAVE_DECL_GETDELIM = 0 || test $REPLACE_GETDELIM = 1]
configure.ac:
gl_FUNC_GETDELIM
diff --git a/modules/getdomainname b/modules/getdomainname
index 5a9d23f585..c7f77b0ec0 100644
--- a/modules/getdomainname
+++ b/modules/getdomainname
@@ -8,8 +8,8 @@ m4/getdomainname.m4
Depends-on:
unistd
extensions
-netdb
-sys_socket
+netdb [test $HAVE_DECL_GETDOMAINNAME = 0 || test $REPLACE_GETDOMAINNAME = 1]
+sys_socket [test $HAVE_DECL_GETDOMAINNAME = 0 || test $REPLACE_GETDOMAINNAME = 1]
configure.ac:
gl_FUNC_GETDOMAINNAME
diff --git a/modules/getgroups b/modules/getgroups
index aabcefc5cc..4903123eb5 100644
--- a/modules/getgroups
+++ b/modules/getgroups
@@ -6,9 +6,9 @@ lib/getgroups.c
m4/getgroups.m4
Depends-on:
-malloc-posix
-stdint
unistd
+malloc-posix [test $HAVE_GETGROUPS = 0 || test $REPLACE_GETGROUPS = 1]
+stdint [test $HAVE_GETGROUPS = 0 || test $REPLACE_GETGROUPS = 1]
configure.ac:
gl_FUNC_GETGROUPS
@@ -20,7 +20,7 @@ Include:
<unistd.h>
License:
-GPL
+LGPL
Maintainer:
Jim Meyering, Eric Blake
diff --git a/modules/gethostname b/modules/gethostname
index 8c24571276..359434ab37 100644
--- a/modules/gethostname
+++ b/modules/gethostname
@@ -8,9 +8,9 @@ lib/w32sock.h
Depends-on:
unistd
-sys_socket
-errno
-sockets
+sys_socket [test $HAVE_GETHOSTNAME = 0]
+errno [test $HAVE_GETHOSTNAME = 0]
+sockets [test $HAVE_GETHOSTNAME = 0]
configure.ac:
gl_FUNC_GETHOSTNAME
diff --git a/modules/getline b/modules/getline
index 1fb9b9c22e..b565f6620b 100644
--- a/modules/getline
+++ b/modules/getline
@@ -6,9 +6,9 @@ lib/getline.c
m4/getline.m4
Depends-on:
-extensions
-getdelim
stdio
+extensions
+getdelim [test $REPLACE_GETLINE = 1]
configure.ac:
gl_FUNC_GETLINE
diff --git a/modules/getlogin_r b/modules/getlogin_r
index 1d5c20b836..c0fb4a691f 100644
--- a/modules/getlogin_r
+++ b/modules/getlogin_r
@@ -6,9 +6,9 @@ lib/getlogin_r.c
m4/getlogin_r.m4
Depends-on:
-extensions
unistd
-memchr
+extensions
+memchr [test $HAVE_GETLOGIN_R = 0 || test $REPLACE_GETLOGIN_R = 1]
configure.ac:
gl_FUNC_GETLOGIN_R
diff --git a/modules/getopt-posix b/modules/getopt-posix
index 93d7fccf10..0443524b3c 100644
--- a/modules/getopt-posix
+++ b/modules/getopt-posix
@@ -9,11 +9,11 @@ lib/getopt_int.h
m4/getopt.m4
Depends-on:
-gettext-h
unistd
extensions
include_next
arg-nonnull
+gettext-h [test $GNULIB_UNISTD_H_GETOPT = 1]
configure.ac:
gl_FUNC_GETOPT_POSIX
@@ -26,7 +26,7 @@ BUILT_SOURCES += $(GETOPT_H)
# We need the following in order to create <getopt.h> when the system
# doesn't have one that works with the given compiler.
-getopt.h: getopt.in.h $(ARG_NONNULL_H)
+getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H)
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \
diff --git a/modules/getpeername b/modules/getpeername
index a8a4fcaff2..4cdae38e2e 100644
--- a/modules/getpeername
+++ b/modules/getpeername
@@ -8,7 +8,7 @@ lib/w32sock.h
Depends-on:
sys_socket
-errno
+errno [test "$ac_cv_header_winsock2_h" = yes]
configure.ac:
AC_REQUIRE([gl_HEADER_SYS_SOCKET])
diff --git a/modules/getsockname b/modules/getsockname
index a7f8881c74..223479e406 100644
--- a/modules/getsockname
+++ b/modules/getsockname
@@ -8,7 +8,7 @@ lib/w32sock.h
Depends-on:
sys_socket
-errno
+errno [test "$ac_cv_header_winsock2_h" = yes]
configure.ac:
AC_REQUIRE([gl_HEADER_SYS_SOCKET])
diff --git a/modules/getsockopt b/modules/getsockopt
index 40ff649817..5b8c18d854 100644
--- a/modules/getsockopt
+++ b/modules/getsockopt
@@ -7,8 +7,8 @@ lib/w32sock.h
Depends-on:
sys_socket
-sys_time
-errno
+sys_time [test "$ac_cv_header_winsock2_h" = yes]
+errno [test "$ac_cv_header_winsock2_h" = yes]
configure.ac:
AC_REQUIRE([gl_HEADER_SYS_SOCKET])
diff --git a/modules/getsubopt b/modules/getsubopt
index a28e2a0a2c..eaf8e87b38 100644
--- a/modules/getsubopt
+++ b/modules/getsubopt
@@ -6,10 +6,10 @@ lib/getsubopt.c
m4/getsubopt.m4
Depends-on:
-extensions
-strchrnul
stdlib
-memchr
+extensions
+strchrnul [test $HAVE_GETSUBOPT = 0]
+memchr [test $HAVE_GETSUBOPT = 0]
configure.ac:
gl_FUNC_GETSUBOPT
diff --git a/modules/gettext b/modules/gettext
index cab538e3c0..ca0b6841dc 100644
--- a/modules/gettext
+++ b/modules/gettext
@@ -1,6 +1,9 @@
Description:
Translate messages to user's native language.
+Notice:
+You must add an invocation of AM_GNU_GETTEXT([external]) to configure.ac.
+
Files:
m4/codeset.m4
m4/fcntl-o.m4
diff --git a/modules/getusershell b/modules/getusershell
index 9ae7dcae1e..56e8b5f0e0 100644
--- a/modules/getusershell
+++ b/modules/getusershell
@@ -8,8 +8,8 @@ m4/getusershell.m4
Depends-on:
unistd
extensions
-fopen-safer
-xalloc
+fopen-safer [test $ac_cv_func_getusershell = no]
+xalloc [test $ac_cv_func_getusershell = no]
configure.ac:
gl_FUNC_GETUSERSHELL
diff --git a/modules/git-merge-changelog b/modules/git-merge-changelog
index d0e2ad02f2..857a8bc5b2 100644
--- a/modules/git-merge-changelog
+++ b/modules/git-merge-changelog
@@ -7,6 +7,7 @@ lib/git-merge-changelog.c
Depends-on:
getopt-gnu
stdbool
+stdlib
progname
error
read-file
diff --git a/modules/glob b/modules/glob
index beaf476c11..2dd31c62cd 100644
--- a/modules/glob
+++ b/modules/glob
@@ -9,22 +9,22 @@ lib/glob.c
m4/glob.m4
Depends-on:
-alloca
arg-nonnull
c++defs
-d-type
-dirfd
extensions
-fnmatch
-getlogin_r
-memchr
-mempcpy
-stdbool
-strdup
-sys_stat
-unistd
warn-on-use
-malloc-posix
+alloca [test -n "$GLOB_H"]
+d-type [test -n "$GLOB_H"]
+dirfd [test -n "$GLOB_H"]
+fnmatch [test -n "$GLOB_H"]
+getlogin_r [test -n "$GLOB_H"]
+memchr [test -n "$GLOB_H"]
+mempcpy [test -n "$GLOB_H"]
+stdbool [test -n "$GLOB_H"]
+strdup [test -n "$GLOB_H"]
+sys_stat [test -n "$GLOB_H"]
+unistd [test -n "$GLOB_H"]
+malloc-posix [test -n "$GLOB_H"]
configure.ac:
gl_GLOB
@@ -37,7 +37,8 @@ BUILT_SOURCES += $(GLOB_H)
# We need the following in order to create <glob.h> when the system
# doesn't have one that works with the given compiler.
-glob.h: glob.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+if GL_GENERATE_GLOB_H
+glob.h: glob.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''HAVE_SYS_CDEFS_H''@|$(HAVE_SYS_CDEFS_H)|g' \
@@ -47,6 +48,10 @@ glob.h: glob.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
< $(srcdir)/glob.in.h; \
} > $@-t && \
mv -f $@-t $@
+else
+glob.h: $(top_builddir)/config.status
+ rm -f $@
+endif
MOSTLYCLEANFILES += glob.h glob.h-t
Include:
diff --git a/modules/gnumakefile b/modules/gnumakefile
index 483ff74dd3..a86475a3ff 100644
--- a/modules/gnumakefile
+++ b/modules/gnumakefile
@@ -14,9 +14,9 @@ configure.ac:
# builds, so use a shell variable to bypass this.
GNUmakefile=GNUmakefile
m4_if(m4_version_compare([2.61a.100],
- m4_defn([m4_PACKAGE_VERSION])), [1], [],
+ m4_defn([m4_PACKAGE_VERSION])), [1], [],
[AC_CONFIG_LINKS([$GNUmakefile:$GNUmakefile], [],
- [GNUmakefile=$GNUmakefile])])
+ [GNUmakefile=$GNUmakefile])])
Makefile.am:
distclean-local: clean-GNUmakefile
diff --git a/modules/grantpt b/modules/grantpt
index a5d9eb4034..589360d175 100644
--- a/modules/grantpt
+++ b/modules/grantpt
@@ -8,9 +8,9 @@ m4/grantpt.m4
Depends-on:
stdlib
extensions
-pt_chown
-waitpid
-configmake
+pt_chown [test $HAVE_GRANTPT = 0]
+waitpid [test $HAVE_GRANTPT = 0]
+configmake [test $HAVE_GRANTPT = 0]
configure.ac:
gl_FUNC_GRANTPT
diff --git a/modules/hash b/modules/hash
index 75a99da373..72afda6cf1 100644
--- a/modules/hash
+++ b/modules/hash
@@ -1,5 +1,5 @@
Description:
-Parametrizable hash table.
+Parameterizable hash table.
Files:
lib/hash.c
@@ -10,7 +10,7 @@ Depends-on:
bitrotate
stdbool
stdint
-xalloc
+xalloc-oversized
configure.ac:
gl_HASH
diff --git a/modules/hash-tests b/modules/hash-tests
index a77bfe7d68..b3f814b6ec 100644
--- a/modules/hash-tests
+++ b/modules/hash-tests
@@ -7,11 +7,9 @@ hash-pjw
inttostr
progname
stdbool
-xalloc
configure.ac:
Makefile.am:
TESTS += test-hash
check_PROGRAMS += test-hash
-test_hash_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/iconv-h b/modules/iconv-h
index 1c35ecd3e0..968800ec41 100644
--- a/modules/iconv-h
+++ b/modules/iconv-h
@@ -22,7 +22,8 @@ BUILT_SOURCES += $(ICONV_H)
# We need the following in order to create <iconv.h> when the system
# doesn't have one that works with the given compiler.
-iconv.h: iconv.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+if GL_GENERATE_ICONV_H
+iconv.h: iconv.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@@ -40,6 +41,10 @@ iconv.h: iconv.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
< $(srcdir)/iconv.in.h; \
} > $@-t && \
mv $@-t $@
+else
+iconv.h: $(top_builddir)/config.status
+ rm -f $@
+endif
MOSTLYCLEANFILES += iconv.h iconv.h-t
Include:
diff --git a/modules/iconv_open b/modules/iconv_open
index 194440b046..527160e793 100644
--- a/modules/iconv_open
+++ b/modules/iconv_open
@@ -14,8 +14,8 @@ Depends-on:
gperf
iconv-h
iconv
-c-ctype
-c-strcase
+c-ctype [test $REPLACE_ICONV_OPEN = 1]
+c-strcase [test $REPLACE_ICONV_OPEN = 1]
configure.ac:
gl_FUNC_ICONV_OPEN
diff --git a/modules/iconv_open-utf b/modules/iconv_open-utf
index be6ff9f4ee..b29b3092d9 100644
--- a/modules/iconv_open-utf
+++ b/modules/iconv_open-utf
@@ -8,9 +8,9 @@ m4/iconv_open.m4
Depends-on:
iconv_open
-stdint
-unistr/u8-mbtoucr
-unistr/u8-uctomb
+stdint [test $REPLACE_ICONV_UTF = 1]
+unistr/u8-mbtoucr [test $REPLACE_ICONV_UTF = 1]
+unistr/u8-uctomb [test $REPLACE_ICONV_UTF = 1]
configure.ac:
gl_FUNC_ICONV_OPEN_UTF
diff --git a/modules/imaxabs b/modules/imaxabs
index 481486d145..8da390f736 100644
--- a/modules/imaxabs
+++ b/modules/imaxabs
@@ -6,7 +6,7 @@ lib/imaxabs.c
m4/imaxabs.m4
Depends-on:
-inttypes
+inttypes-incomplete
configure.ac:
gl_FUNC_IMAXABS
diff --git a/modules/imaxdiv b/modules/imaxdiv
index 7eacbc750d..7589024c07 100644
--- a/modules/imaxdiv
+++ b/modules/imaxdiv
@@ -6,7 +6,7 @@ lib/imaxdiv.c
m4/imaxdiv.m4
Depends-on:
-inttypes
+inttypes-incomplete
configure.ac:
gl_FUNC_IMAXDIV
diff --git a/modules/inet_ntop b/modules/inet_ntop
index 3b00b62a08..7e9c7f4198 100644
--- a/modules/inet_ntop
+++ b/modules/inet_ntop
@@ -6,11 +6,11 @@ lib/inet_ntop.c
m4/inet_ntop.m4
Depends-on:
-sys_socket
arpa_inet
-errno
-netinet_in
extensions
+sys_socket [test "$ac_cv_search_inet_ntop" = no && test $ac_cv_func_inet_ntop = no]
+errno [test "$ac_cv_search_inet_ntop" = no && test $ac_cv_func_inet_ntop = no]
+netinet_in [test "$ac_cv_search_inet_ntop" = no && test $ac_cv_func_inet_ntop = no]
configure.ac:
gl_FUNC_INET_NTOP
diff --git a/modules/inet_pton b/modules/inet_pton
index 44c50b892e..18fe07ec5f 100644
--- a/modules/inet_pton
+++ b/modules/inet_pton
@@ -6,12 +6,12 @@ lib/inet_pton.c
m4/inet_pton.m4
Depends-on:
-c-ctype
-sys_socket
arpa_inet
-errno
-netinet_in
extensions
+c-ctype [test "$ac_cv_search_inet_pton" = no && test $ac_cv_func_inet_pton = no]
+sys_socket [test "$ac_cv_search_inet_pton" = no && test $ac_cv_func_inet_pton = no]
+errno [test "$ac_cv_search_inet_pton" = no && test $ac_cv_func_inet_pton = no]
+netinet_in [test "$ac_cv_search_inet_pton" = no && test $ac_cv_func_inet_pton = no]
configure.ac:
gl_FUNC_INET_PTON
diff --git a/modules/inttypes b/modules/inttypes
index 991fe4e1a3..68a272e002 100644
--- a/modules/inttypes
+++ b/modules/inttypes
@@ -2,16 +2,10 @@ Description:
An <inttypes.h> that nearly conforms to C99.
Files:
-lib/inttypes.in.h
m4/inttypes-pri.m4
-m4/inttypes.m4
Depends-on:
-arg-nonnull
-include_next
-multiarch
-stdint
-warn-on-use
+inttypes-incomplete
configure.ac:
gl_INTTYPES_H
diff --git a/modules/inttypes-incomplete b/modules/inttypes-incomplete
new file mode 100644
index 0000000000..ef743dd604
--- /dev/null
+++ b/modules/inttypes-incomplete
@@ -0,0 +1,62 @@
+Description:
+An <inttypes.h> that conforms to C99 except for PRI* and SCN* macros.
+
+Files:
+lib/inttypes.in.h
+m4/inttypes.m4
+
+Depends-on:
+arg-nonnull
+include_next
+multiarch
+stdint
+warn-on-use
+
+configure.ac:
+gl_INTTYPES_INCOMPLETE
+
+Makefile.am:
+BUILT_SOURCES += inttypes.h
+
+# We need the following in order to create <inttypes.h> when the system
+# doesn't have one that works with the given compiler.
+inttypes.h: inttypes.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) $(ARG_NONNULL_H)
+ $(AM_V_GEN)rm -f $@-t $@ && \
+ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+ sed -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
+ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+ -e 's|@''NEXT_INTTYPES_H''@|$(NEXT_INTTYPES_H)|g' \
+ -e 's/@''PRI_MACROS_BROKEN''@/$(PRI_MACROS_BROKEN)/g' \
+ -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \
+ -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \
+ -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \
+ -e 's/@''PRIPTR_PREFIX''@/$(PRIPTR_PREFIX)/g' \
+ -e 's/@''GNULIB_IMAXABS''@/$(GNULIB_IMAXABS)/g' \
+ -e 's/@''GNULIB_IMAXDIV''@/$(GNULIB_IMAXDIV)/g' \
+ -e 's/@''GNULIB_STRTOIMAX''@/$(GNULIB_STRTOIMAX)/g' \
+ -e 's/@''GNULIB_STRTOUMAX''@/$(GNULIB_STRTOUMAX)/g' \
+ -e 's/@''HAVE_DECL_IMAXABS''@/$(HAVE_DECL_IMAXABS)/g' \
+ -e 's/@''HAVE_DECL_IMAXDIV''@/$(HAVE_DECL_IMAXDIV)/g' \
+ -e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \
+ -e 's/@''HAVE_DECL_STRTOUMAX''@/$(HAVE_DECL_STRTOUMAX)/g' \
+ -e 's/@''INT32_MAX_LT_INTMAX_MAX''@/$(INT32_MAX_LT_INTMAX_MAX)/g' \
+ -e 's/@''INT64_MAX_EQ_LONG_MAX''@/$(INT64_MAX_EQ_LONG_MAX)/g' \
+ -e 's/@''UINT32_MAX_LT_UINTMAX_MAX''@/$(UINT32_MAX_LT_UINTMAX_MAX)/g' \
+ -e 's/@''UINT64_MAX_EQ_ULONG_MAX''@/$(UINT64_MAX_EQ_ULONG_MAX)/g' \
+ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+ < $(srcdir)/inttypes.in.h; \
+ } > $@-t && \
+ mv $@-t $@
+MOSTLYCLEANFILES += inttypes.h inttypes.h-t
+
+Include:
+<inttypes.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+all
diff --git a/modules/ioctl b/modules/ioctl
index 5ba70ed98c..57328f3efb 100644
--- a/modules/ioctl
+++ b/modules/ioctl
@@ -8,8 +8,9 @@ m4/ioctl.m4
Depends-on:
sys_ioctl
-sys_socket
-errno
+sys_socket [test "$ac_cv_header_winsock2_h" = yes || test $REPLACE_IOCTL = 1]
+errno [test "$ac_cv_header_winsock2_h" = yes || test $REPLACE_IOCTL = 1]
+fd-hook [test "$ac_cv_header_winsock2_h" = yes || test $REPLACE_IOCTL = 1]
configure.ac:
gl_FUNC_IOCTL
diff --git a/modules/isapipe b/modules/isapipe
index 6352af4519..ee1c2202d6 100644
--- a/modules/isapipe
+++ b/modules/isapipe
@@ -7,9 +7,9 @@ lib/isapipe.h
m4/isapipe.m4
Depends-on:
-stdbool
-sys_stat
-unistd
+stdbool [test $ac_cv_func_isapipe = no]
+sys_stat [test $ac_cv_func_isapipe = no]
+unistd [test $ac_cv_func_isapipe = no]
configure.ac:
gl_ISAPIPE
diff --git a/modules/isfinite b/modules/isfinite
index f122c5ad70..259da35f5a 100644
--- a/modules/isfinite
+++ b/modules/isfinite
@@ -7,11 +7,11 @@ m4/isfinite.m4
m4/check-math-lib.m4
Depends-on:
-isnanf-nolibm
-isnand-nolibm
-isnanl-nolibm
math
extensions
+isnanf-nolibm [test $REPLACE_ISFINITE = 1]
+isnand-nolibm [test $REPLACE_ISFINITE = 1]
+isnanl-nolibm [test $REPLACE_ISFINITE = 1]
configure.ac:
gl_ISFINITE
@@ -23,7 +23,7 @@ Include:
<math.h>
License:
-GPL
+LGPL
Maintainer:
Ben Pfaff
diff --git a/modules/isinf b/modules/isinf
index 2c6851c060..1a8399fe7b 100644
--- a/modules/isinf
+++ b/modules/isinf
@@ -7,9 +7,9 @@ m4/isinf.m4
m4/check-math-lib.m4
Depends-on:
-float
math
extensions
+float [test $REPLACE_ISINF = 1]
configure.ac:
gl_ISINF
diff --git a/modules/langinfo b/modules/langinfo
index e864c91a89..91c87750ad 100644
--- a/modules/langinfo
+++ b/modules/langinfo
@@ -21,7 +21,7 @@ BUILT_SOURCES += langinfo.h
# We need the following in order to create an empty placeholder for
# <langinfo.h> when the system doesn't have one.
-langinfo.h: langinfo.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
+langinfo.h: langinfo.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''HAVE_LANGINFO_H''@|$(HAVE_LANGINFO_H)|g' \
diff --git a/modules/lchown b/modules/lchown
index 9fea1b3375..d9d140e3c4 100644
--- a/modules/lchown
+++ b/modules/lchown
@@ -6,12 +6,12 @@ lib/lchown.c
m4/lchown.m4
Depends-on:
-chown
-errno
-lstat
-stdbool
-sys_stat
unistd
+chown [test $HAVE_LCHOWN = 0 || test $REPLACE_LCHOWN = 1]
+errno [test $HAVE_LCHOWN = 0 || test $REPLACE_LCHOWN = 1]
+lstat [test $HAVE_LCHOWN = 0 || test $REPLACE_LCHOWN = 1]
+stdbool [test $HAVE_LCHOWN = 0 || test $REPLACE_LCHOWN = 1]
+sys_stat [test $HAVE_LCHOWN = 0 || test $REPLACE_LCHOWN = 1]
configure.ac:
gl_FUNC_LCHOWN
diff --git a/modules/ldexpl b/modules/ldexpl
index 7dd82ccb38..517a40a8dd 100644
--- a/modules/ldexpl
+++ b/modules/ldexpl
@@ -7,8 +7,8 @@ m4/ldexpl.m4
Depends-on:
math
-isnanl
-fpucw
+isnanl [test $HAVE_DECL_LDEXPL = 0 || test $gl_func_ldexpl = no]
+fpucw [test $HAVE_DECL_LDEXPL = 0 || test $gl_func_ldexpl = no]
configure.ac:
gl_FUNC_LDEXPL
diff --git a/modules/link b/modules/link
index 6a006c31e0..38cf5ec9f0 100644
--- a/modules/link
+++ b/modules/link
@@ -6,10 +6,10 @@ lib/link.c
m4/link.m4
Depends-on:
-stat
-strdup-posix
-sys_stat
unistd
+stat [test $HAVE_LINK = 0 || test $REPLACE_LINK = 1]
+strdup-posix [test $HAVE_LINK = 0 || test $REPLACE_LINK = 1]
+sys_stat [test $HAVE_LINK = 0 || test $REPLACE_LINK = 1]
configure.ac:
gl_FUNC_LINK
diff --git a/modules/linkat b/modules/linkat
index 53e2a071e2..2cb717776f 100644
--- a/modules/linkat
+++ b/modules/linkat
@@ -7,23 +7,24 @@ lib/linkat.c
m4/linkat.m4
Depends-on:
-areadlink
-areadlinkat
-dirname-lgpl
-errno
-extensions
-fcntl-h
-filenamecat-lgpl
-openat
-link
-link-follow
-lstat
-readlink
-same-inode
-stpcpy
-symlink
-symlinkat
unistd
+extensions
+areadlink [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
+areadlinkat [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
+dirname-lgpl [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
+errno [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
+fcntl-h [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
+filenamecat-lgpl [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
+getcwd-lgpl [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
+openat [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
+link [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
+link-follow [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
+lstat [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
+readlink [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
+same-inode [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
+stpcpy [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
+symlink [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
+symlinkat [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
configure.ac:
gl_FUNC_LINKAT
diff --git a/modules/linkat-tests b/modules/linkat-tests
index 6df4781973..3f2d3f090c 100644
--- a/modules/linkat-tests
+++ b/modules/linkat-tests
@@ -7,14 +7,13 @@ tests/macros.h
Depends-on:
ignore-value
areadlink-with-size
-filenamecat
+filenamecat-lgpl
+getcwd-lgpl
progname
same-inode
-xgetcwd
configure.ac:
Makefile.am:
TESTS += test-linkat
check_PROGRAMS += test-linkat
-test_linkat_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/listen b/modules/listen
index 6912f5d695..7c77557d5c 100644
--- a/modules/listen
+++ b/modules/listen
@@ -7,7 +7,7 @@ lib/w32sock.h
Depends-on:
sys_socket
-errno
+errno [test "$ac_cv_header_winsock2_h" = yes]
configure.ac:
AC_REQUIRE([gl_HEADER_SYS_SOCKET])
diff --git a/modules/locale b/modules/locale
index 7b4d1c7b15..bab5a7d48b 100644
--- a/modules/locale
+++ b/modules/locale
@@ -23,7 +23,7 @@ BUILT_SOURCES += locale.h
# We need the following in order to create <locale.h> when the system
# doesn't have one that provides all definitions.
-locale.h: locale.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+locale.h: locale.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
diff --git a/modules/logl b/modules/logl
index c9b7237dc2..95fd1a0371 100644
--- a/modules/logl
+++ b/modules/logl
@@ -8,9 +8,9 @@ m4/logl.m4
Depends-on:
math
extensions
-frexpl
-isnanl
-floorl
+frexpl [test $HAVE_LOGL = 0]
+isnanl [test $HAVE_LOGL = 0]
+floorl [test $HAVE_LOGL = 0]
configure.ac:
gl_FUNC_LOGL
@@ -25,7 +25,7 @@ Link:
$(LOGL_LIBM)
License:
-GPL
+LGPL
Maintainer:
Paolo Bonzini
diff --git a/modules/long-options b/modules/long-options
index 29bf734dc0..207610c63d 100644
--- a/modules/long-options
+++ b/modules/long-options
@@ -8,6 +8,7 @@ m4/long-options.m4
Depends-on:
getopt-gnu
+stdlib
version-etc
configure.ac:
diff --git a/modules/lstat b/modules/lstat
index e53ac7ed70..a945a11636 100644
--- a/modules/lstat
+++ b/modules/lstat
@@ -6,9 +6,9 @@ lib/lstat.c
m4/lstat.m4
Depends-on:
-dosname
-stat
sys_stat
+dosname [test $REPLACE_LSTAT = 1]
+stat [test $REPLACE_LSTAT = 1]
configure.ac:
gl_FUNC_LSTAT
diff --git a/modules/math b/modules/math
index 3208d4d310..01544c5115 100644
--- a/modules/math
+++ b/modules/math
@@ -21,7 +21,7 @@ BUILT_SOURCES += math.h
# 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 $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
sed -e 's|@''INCLUDE_NEXT_AS_FIRST_DIRECTIVE''@|$(INCLUDE_NEXT_AS_FIRST_DIRECTIVE)|g' \
diff --git a/modules/mbrlen b/modules/mbrlen
index e7f36734eb..5bc9f297ca 100644
--- a/modules/mbrlen
+++ b/modules/mbrlen
@@ -8,8 +8,8 @@ m4/mbstate_t.m4
Depends-on:
wchar
-mbrtowc
extensions
+mbrtowc [test $HAVE_MBRLEN = 0 || test $REPLACE_MBRLEN = 1]
configure.ac:
gl_FUNC_MBRLEN
diff --git a/modules/mbrtowc b/modules/mbrtowc
index 5981633e60..85cde1e394 100644
--- a/modules/mbrtowc
+++ b/modules/mbrtowc
@@ -12,11 +12,11 @@ m4/codeset.m4
Depends-on:
wchar
-mbsinit
-localcharset
-streq
-verify
extensions
+mbsinit [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1]
+localcharset [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1]
+streq [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1]
+verify [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1]
configure.ac:
gl_FUNC_MBRTOWC
diff --git a/modules/mbsinit b/modules/mbsinit
index 4e673c7742..a8ee058a0e 100644
--- a/modules/mbsinit
+++ b/modules/mbsinit
@@ -8,9 +8,9 @@ m4/mbstate_t.m4
Depends-on:
wchar
-mbrtowc
-verify
extensions
+mbrtowc [test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1]
+verify [test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1]
configure.ac:
gl_FUNC_MBSINIT
diff --git a/modules/mbsnrtowcs b/modules/mbsnrtowcs
index e8975b8545..a179296810 100644
--- a/modules/mbsnrtowcs
+++ b/modules/mbsnrtowcs
@@ -9,11 +9,11 @@ m4/mbsnrtowcs.m4
m4/mbstate_t.m4
Depends-on:
-extensions
wchar
-mbrtowc
-minmax
-strnlen1
+extensions
+mbrtowc [test $HAVE_MBSNRTOWCS = 0 || test $REPLACE_MBSNRTOWCS = 1]
+minmax [test $HAVE_MBSNRTOWCS = 0 || test $REPLACE_MBSNRTOWCS = 1]
+strnlen1 [test $HAVE_MBSNRTOWCS = 0 || test $REPLACE_MBSNRTOWCS = 1]
configure.ac:
gl_FUNC_MBSNRTOWCS
diff --git a/modules/mbsrtowcs b/modules/mbsrtowcs
index 973b69538d..66dd78f67b 100644
--- a/modules/mbsrtowcs
+++ b/modules/mbsrtowcs
@@ -14,9 +14,9 @@ m4/codeset.m4
Depends-on:
wchar
-mbrtowc
-strnlen1
extensions
+mbrtowc [test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1]
+strnlen1 [test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1]
configure.ac:
gl_FUNC_MBSRTOWCS
diff --git a/modules/mbtowc b/modules/mbtowc
index f41d508385..02b0c88dcf 100644
--- a/modules/mbtowc
+++ b/modules/mbtowc
@@ -8,8 +8,8 @@ m4/mbtowc.m4
Depends-on:
stdlib
-mbrtowc
-wchar
+mbrtowc [test $REPLACE_MBTOWC = 1]
+wchar [test $REPLACE_MBTOWC = 1]
configure.ac:
gl_FUNC_MBTOWC
diff --git a/modules/memchr b/modules/memchr
index 495f2e26bd..229b3a5bfe 100644
--- a/modules/memchr
+++ b/modules/memchr
@@ -10,6 +10,7 @@ m4/mmap-anon.m4
Depends-on:
extensions
string
+memchr-obsolete
configure.ac:
gl_FUNC_MEMCHR
diff --git a/modules/memchr-obsolete b/modules/memchr-obsolete
new file mode 100644
index 0000000000..c1033b6605
--- /dev/null
+++ b/modules/memchr-obsolete
@@ -0,0 +1,28 @@
+Description:
+memchr() function for old platforms.
+
+Status:
+obsolete
+
+Notice:
+This module is obsolete.
+
+Files:
+m4/memchr-obsolete.m4
+
+Depends-on:
+memchr
+
+configure.ac:
+gl_FUNC_MEMCHR_OBSOLETE
+
+Makefile.am:
+
+Include:
+<string.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+Bruno Haible
diff --git a/modules/memcmp b/modules/memcmp
index c6bc26200a..dda4324882 100644
--- a/modules/memcmp
+++ b/modules/memcmp
@@ -12,7 +12,7 @@ lib/memcmp.c
m4/memcmp.m4
Depends-on:
-stdint
+stdint [test $ac_cv_func_memcmp_working = no]
configure.ac:
gl_FUNC_MEMCMP
diff --git a/modules/mgetgroups b/modules/mgetgroups
index c404d01435..1aa1c79ae6 100644
--- a/modules/mgetgroups
+++ b/modules/mgetgroups
@@ -10,7 +10,7 @@ Depends-on:
getgroups
getugroups
realloc-gnu
-xalloc
+xalloc-oversized
configure.ac:
gl_MGETGROUPS
diff --git a/modules/mkdir b/modules/mkdir
index 08089d008f..44b9057fc8 100644
--- a/modules/mkdir
+++ b/modules/mkdir
@@ -6,8 +6,8 @@ lib/mkdir.c
m4/mkdir.m4
Depends-on:
-dirname-lgpl
sys_stat
+dirname-lgpl [test $REPLACE_MKDIR = 1]
configure.ac:
gl_FUNC_MKDIR
diff --git a/modules/mkdtemp b/modules/mkdtemp
index 3c5aeee29b..4ca30c49ac 100644
--- a/modules/mkdtemp
+++ b/modules/mkdtemp
@@ -6,9 +6,9 @@ lib/mkdtemp.c
m4/mkdtemp.m4
Depends-on:
-stdint
stdlib
-tempname
+stdint [test $HAVE_MKDTEMP = 0]
+tempname [test $HAVE_MKDTEMP = 0]
configure.ac:
gt_FUNC_MKDTEMP
diff --git a/modules/mkfifo b/modules/mkfifo
index 3eaaad6c69..dae3755f73 100644
--- a/modules/mkfifo
+++ b/modules/mkfifo
@@ -6,8 +6,8 @@ lib/mkfifo.c
m4/mkfifo.m4
Depends-on:
-stat
sys_stat
+stat [test $HAVE_MKFIFO = 0 || test $REPLACE_MKFIFO = 1]
configure.ac:
gl_FUNC_MKFIFO
diff --git a/modules/mkfifoat b/modules/mkfifoat
index 2bc7e65573..705fb4f9cf 100644
--- a/modules/mkfifoat
+++ b/modules/mkfifoat
@@ -7,12 +7,12 @@ lib/mknodat.c
m4/mkfifoat.m4
Depends-on:
+sys_stat
extensions
fcntl-h
-mkfifo
-mknod
-openat
-sys_stat
+mkfifo [test $HAVE_MKFIFOAT = 0]
+mknod [test $HAVE_MKNODAT = 0]
+openat [test $HAVE_MKFIFOAT = 0 || test $HAVE_MKNODAT = 0]
configure.ac:
gl_FUNC_MKFIFOAT
diff --git a/modules/mkfifoat-tests b/modules/mkfifoat-tests
index 8be33df05d..a1e33c9812 100644
--- a/modules/mkfifoat-tests
+++ b/modules/mkfifoat-tests
@@ -13,4 +13,3 @@ configure.ac:
Makefile.am:
TESTS += test-mkfifoat
check_PROGRAMS += test-mkfifoat
-test_mkfifoat_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/mknod b/modules/mknod
index c965606e7f..6db2d5e08c 100644
--- a/modules/mknod
+++ b/modules/mknod
@@ -6,10 +6,10 @@ lib/mknod.c
m4/mknod.m4
Depends-on:
-mkfifo
-stat
sys_stat
extensions
+mkfifo [test $HAVE_MKNOD = 0 || test $REPLACE_MKNOD = 1]
+stat [test $HAVE_MKNOD = 0 || test $REPLACE_MKNOD = 1]
configure.ac:
gl_FUNC_MKNOD
diff --git a/modules/mkostemp b/modules/mkostemp
index 8a61dbeb07..85b01b7e26 100644
--- a/modules/mkostemp
+++ b/modules/mkostemp
@@ -7,9 +7,9 @@ lib/mkostemp.c
m4/mkostemp.m4
Depends-on:
-extensions
stdlib
-tempname
+extensions
+tempname [test $HAVE_MKOSTEMP = 0]
configure.ac:
gl_FUNC_MKOSTEMP
diff --git a/modules/mkostemps b/modules/mkostemps
index a4175bdb50..ff3c97acee 100644
--- a/modules/mkostemps
+++ b/modules/mkostemps
@@ -7,9 +7,9 @@ lib/mkostemps.c
m4/mkostemps.m4
Depends-on:
-extensions
stdlib
-tempname
+extensions
+tempname [test $HAVE_MKOSTEMPS = 0]
configure.ac:
gl_FUNC_MKOSTEMPS
diff --git a/modules/mkstemp b/modules/mkstemp
index 265144b942..0f4fef6665 100644
--- a/modules/mkstemp
+++ b/modules/mkstemp
@@ -6,9 +6,9 @@ lib/mkstemp.c
m4/mkstemp.m4
Depends-on:
-extensions
stdlib
-tempname
+extensions
+tempname [test $HAVE_MKSTEMP = 0 || test $REPLACE_MKSTEMP = 1]
configure.ac:
gl_FUNC_MKSTEMP
diff --git a/modules/mkstemps b/modules/mkstemps
index 2a49777674..56718a9b42 100644
--- a/modules/mkstemps
+++ b/modules/mkstemps
@@ -6,9 +6,9 @@ lib/mkstemps.c
m4/mkstemps.m4
Depends-on:
-extensions
stdlib
-tempname
+extensions
+tempname [test $HAVE_MKSTEMPS = 0]
configure.ac:
gl_FUNC_MKSTEMPS
diff --git a/modules/mktime b/modules/mktime
index d5b0ee7954..81aa7148d0 100644
--- a/modules/mktime
+++ b/modules/mktime
@@ -8,7 +8,7 @@ m4/mktime.m4
Depends-on:
multiarch
-time_r
+time_r [test $REPLACE_MKTIME = 1]
configure.ac:
gl_FUNC_MKTIME
diff --git a/modules/nanosleep b/modules/nanosleep
index dfe1c7acbe..32af74b9fb 100644
--- a/modules/nanosleep
+++ b/modules/nanosleep
@@ -6,16 +6,16 @@ lib/nanosleep.c
m4/nanosleep.m4
Depends-on:
+time
extensions
-intprops
multiarch
-select
-sigaction
-stdbool
-sys_select
-sys_time
-time
-verify
+intprops [test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1]
+select [test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1]
+sigaction [test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1]
+stdbool [test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1]
+sys_select [test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1]
+sys_time [test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1]
+verify [test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1]
configure.ac:
gl_FUNC_NANOSLEEP
@@ -30,7 +30,7 @@ Link:
$(LIB_NANOSLEEP)
License:
-GPL
+LGPL
Maintainer:
Jim Meyering
diff --git a/modules/netdb b/modules/netdb
index c68692c7e6..efc989b3c2 100644
--- a/modules/netdb
+++ b/modules/netdb
@@ -6,6 +6,7 @@ lib/netdb.in.h
m4/netdb_h.m4
Depends-on:
+c++defs
include_next
arg-nonnull
warn-on-use
@@ -21,7 +22,7 @@ BUILT_SOURCES += netdb.h
# We need the following in order to create <netdb.h> when the system
# doesn't have one that works with the given compiler.
-netdb.h: netdb.in.h $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+netdb.h: netdb.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@@ -35,6 +36,8 @@ netdb.h: netdb.in.h $(ARG_NONNULL_H) $(WARN_ON_USE_H)
-e 's|@''HAVE_DECL_GAI_STRERROR''@|$(HAVE_DECL_GAI_STRERROR)|g' \
-e 's|@''HAVE_DECL_GETADDRINFO''@|$(HAVE_DECL_GETADDRINFO)|g' \
-e 's|@''HAVE_DECL_GETNAMEINFO''@|$(HAVE_DECL_GETNAMEINFO)|g' \
+ -e 's|@''REPLACE_GAI_STRERROR''@|$(REPLACE_GAI_STRERROR)|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)' \
< $(srcdir)/netdb.in.h; \
diff --git a/modules/netdb-c++-tests b/modules/netdb-c++-tests
new file mode 100644
index 0000000000..af07dee341
--- /dev/null
+++ b/modules/netdb-c++-tests
@@ -0,0 +1,19 @@
+Files:
+tests/test-netdb-c++.cc
+tests/signature.h
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-netdb-c++
+check_PROGRAMS += test-netdb-c++
+test_netdb_c___SOURCES = test-netdb-c++.cc
+test_netdb_c___LDADD = $(LDADD) $(GETADDRINFO_LIB)
+endif
diff --git a/modules/netdb-tests b/modules/netdb-tests
index 1c3ae0b3e3..3590c94aaa 100644
--- a/modules/netdb-tests
+++ b/modules/netdb-tests
@@ -2,6 +2,7 @@ Files:
tests/test-netdb.c
Depends-on:
+netdb-c++-tests
configure.ac:
diff --git a/modules/netinet_in b/modules/netinet_in
index 28b80c8e27..abd425c9aa 100644
--- a/modules/netinet_in
+++ b/modules/netinet_in
@@ -21,7 +21,8 @@ BUILT_SOURCES += $(NETINET_IN_H)
# We need the following in order to create <netinet/in.h> when the system
# doesn't have one.
-netinet/in.h: netinet_in.in.h
+if GL_GENERATE_NETINET_IN_H
+netinet/in.h: netinet_in.in.h $(top_builddir)/config.status
$(AM_V_at)$(MKDIR_P) netinet
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
@@ -33,6 +34,10 @@ netinet/in.h: netinet_in.in.h
< $(srcdir)/netinet_in.in.h; \
} > $@-t && \
mv $@-t $@
+else
+netinet/in.h: $(top_builddir)/config.status
+ rm -f $@
+endif
MOSTLYCLEANFILES += netinet/in.h netinet/in.h-t
MOSTLYCLEANDIRS += netinet
diff --git a/modules/nonblocking b/modules/nonblocking
index 9528405fab..2d469ebaa4 100644
--- a/modules/nonblocking
+++ b/modules/nonblocking
@@ -2,16 +2,33 @@ Description:
Read, set or clear the non-blocking file descriptor flag.
Files:
-lib/nonblocking.c
lib/nonblocking.h
+lib/nonblocking.c
+m4/nonblocking.m4
+lib/stdio-read.c
+lib/stdio-write.c
+m4/asm-underscore.m4
Depends-on:
fcntl-h
ioctl
stdbool
+stdio
sys_socket
+unistd
configure.ac:
+gl_NONBLOCKING_IO
+gl_FCNTL_MODULE_INDICATOR([nonblocking])
+dnl Define the C macro GNULIB_NONBLOCKING to 1.
+gl_MODULE_INDICATOR([nonblocking])
+dnl Define the substituted variable GNULIB_STDIO_H_NONBLOCKING to 1.
+AC_REQUIRE([gl_STDIO_H_DEFAULTS])
+AC_REQUIRE([gl_ASM_SYMBOL_PREFIX])
+GNULIB_STDIO_H_NONBLOCKING=1
+dnl Define the substituted variable GNULIB_UNISTD_H_NONBLOCKING to 1.
+AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
+GNULIB_UNISTD_H_NONBLOCKING=1
Makefile.am:
lib_SOURCES += nonblocking.c
diff --git a/modules/nonblocking-pipe-tests b/modules/nonblocking-pipe-tests
new file mode 100644
index 0000000000..428452f78e
--- /dev/null
+++ b/modules/nonblocking-pipe-tests
@@ -0,0 +1,34 @@
+Files:
+tests/test-nonblocking-pipe.sh
+tests/test-nonblocking-pipe-main.c
+tests/test-nonblocking-pipe-child.c
+tests/test-nonblocking-pipe.h
+tests/test-nonblocking-writer.h
+tests/test-nonblocking-reader.h
+tests/test-nonblocking-misc.h
+tests/macros.h
+
+Depends-on:
+stdbool
+unistd
+nonblocking
+wait-process
+pipe-posix
+dup2
+environ
+posix_spawnp
+binary-io
+gettimeofday
+snprintf
+vsnprintf
+strerror
+ssize_t
+usleep
+read
+write
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-nonblocking-pipe.sh
+check_PROGRAMS += test-nonblocking-pipe-main test-nonblocking-pipe-child
diff --git a/modules/nonblocking-socket-tests b/modules/nonblocking-socket-tests
new file mode 100644
index 0000000000..368bed8828
--- /dev/null
+++ b/modules/nonblocking-socket-tests
@@ -0,0 +1,46 @@
+Files:
+tests/test-nonblocking-socket.sh
+tests/test-nonblocking-socket-main.c
+tests/test-nonblocking-socket-child.c
+tests/test-nonblocking-socket.h
+tests/test-nonblocking-writer.h
+tests/test-nonblocking-reader.h
+tests/test-nonblocking-misc.h
+tests/socket-server.h
+tests/socket-client.h
+tests/macros.h
+
+Depends-on:
+stdbool
+unistd
+sys_socket
+nonblocking
+wait-process
+environ
+posix_spawnp
+netinet_in
+arpa_inet
+socket
+setsockopt
+bind
+getsockname
+listen
+accept
+getsockopt
+connect
+gettimeofday
+snprintf
+vsnprintf
+strerror
+ssize_t
+usleep
+read
+write
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-nonblocking-socket.sh
+check_PROGRAMS += test-nonblocking-socket-main test-nonblocking-socket-child
+test_nonblocking_socket_main_LDADD = $(LDADD) $(LIBSOCKET)
+test_nonblocking_socket_child_LDADD = $(LDADD) $(LIBSOCKET)
diff --git a/modules/nonblocking-tests b/modules/nonblocking-tests
index 34d206d779..b84a32713f 100644
--- a/modules/nonblocking-tests
+++ b/modules/nonblocking-tests
@@ -5,11 +5,12 @@ tests/macros.h
Depends-on:
close
pipe-posix
-socket
+nonblocking-pipe-tests
+nonblocking-socket-tests
configure.ac:
Makefile.am:
TESTS += test-nonblocking
check_PROGRAMS += test-nonblocking
-test_nonblocking_LDADD = $(LDADD) @LIBSOCKET@
+test_nonblocking_LDADD = $(LDADD) $(LIBSOCKET)
diff --git a/modules/obstack b/modules/obstack
index af12846b95..bceecdc64c 100644
--- a/modules/obstack
+++ b/modules/obstack
@@ -7,9 +7,9 @@ lib/obstack.c
Depends-on:
gettext-h
-exit
exitfail
stdint
+stdlib
configure.ac:
AC_FUNC_OBSTACK
diff --git a/modules/open b/modules/open
index 29829084eb..ea0f5ae57c 100644
--- a/modules/open
+++ b/modules/open
@@ -8,7 +8,7 @@ m4/mode_t.m4
Depends-on:
fcntl-h
-stat
+stat [test $REPLACE_OPEN = 1]
configure.ac:
gl_FUNC_OPEN
diff --git a/modules/openat b/modules/openat
index 35917c59d7..abd3b63b95 100644
--- a/modules/openat
+++ b/modules/openat
@@ -24,18 +24,18 @@ fcntl-h
fdopendir
gettext-h
intprops
-lchown
+lchown [test $HAVE_FCHOWNAT = 0 || test $REPLACE_FCHOWNAT = 1]
lstat
-mkdir
+mkdir [test $HAVE_MKDIRAT = 0]
open
openat-die
-rmdir
+rmdir [test $REPLACE_UNLINKAT = 1]
same-inode
save-cwd
stdbool
sys_stat
unistd
-unlink
+unlink [test $REPLACE_UNLINKAT = 1]
configure.ac:
gl_FUNC_OPENAT
diff --git a/modules/openat-safer-tests b/modules/openat-safer-tests
index 1f0b158fc0..a33d2c6b68 100644
--- a/modules/openat-safer-tests
+++ b/modules/openat-safer-tests
@@ -9,4 +9,3 @@ configure.ac:
Makefile.am:
TESTS += test-openat-safer
check_PROGRAMS += test-openat-safer
-test_openat_safer_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/openat-tests b/modules/openat-tests
index 250a574593..959d882333 100644
--- a/modules/openat-tests
+++ b/modules/openat-tests
@@ -31,8 +31,3 @@ Makefile.am:
TESTS += test-fchownat test-fstatat test-mkdirat test-openat test-unlinkat
check_PROGRAMS += test-fchownat test-fstatat test-mkdirat test-openat \
test-unlinkat
-test_fchownat_LDADD = $(LDADD) @LIBINTL@
-test_fstatat_LDADD = $(LDADD) @LIBINTL@
-test_mkdirat_LDADD = $(LDADD) @LIBINTL@
-test_openat_LDADD = $(LDADD) @LIBINTL@
-test_unlinkat_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/pagealign_alloc b/modules/pagealign_alloc
index 5972aa152d..357a335197 100644
--- a/modules/pagealign_alloc
+++ b/modules/pagealign_alloc
@@ -9,10 +9,10 @@ m4/pagealign_alloc.m4
Depends-on:
error
-exit
extensions
getpagesize
gettext-h
+stdlib
xalloc
unistd
diff --git a/modules/passfd b/modules/passfd
index 74ef4102c4..b3d8a3c022 100644
--- a/modules/passfd
+++ b/modules/passfd
@@ -4,17 +4,15 @@ Pass file descriptors along Unix domain sockets
Files:
lib/passfd.h
lib/passfd.c
-m4/afunix.m4
-m4/sockpfaf.m4
+m4/passfd.m4
Depends-on:
cloexec
sys_socket
socketlib
-extensions
configure.ac:
-gl_SOCKET_AFUNIX
+gl_PASSFD
Makefile.am:
lib_SOURCES += passfd.c
diff --git a/modules/passfd-tests b/modules/passfd-tests
index 477754b2ba..9bb1c5c1be 100644
--- a/modules/passfd-tests
+++ b/modules/passfd-tests
@@ -3,9 +3,11 @@ tests/test-passfd.c
tests/macros.h
Depends-on:
+sys_wait
configure.ac:
AC_CHECK_DECLS_ONCE([alarm])
+AC_CHECK_FUNCS_ONCE([socketpair])
Makefile.am:
TESTS += test-passfd
diff --git a/modules/perror b/modules/perror
index c01902959b..d2147b6b66 100644
--- a/modules/perror
+++ b/modules/perror
@@ -7,8 +7,8 @@ m4/perror.m4
Depends-on:
stdio
-errno
-strerror
+errno [test $REPLACE_PERROR = 1]
+strerror [test $REPLACE_PERROR = 1]
configure.ac:
gl_FUNC_PERROR
diff --git a/modules/pipe-filter-gi b/modules/pipe-filter-gi
index 7122c1ad49..ac56c60f3d 100644
--- a/modules/pipe-filter-gi
+++ b/modules/pipe-filter-gi
@@ -10,10 +10,11 @@ Depends-on:
spawn-pipe
wait-process
error
-exit
+fcntl-h
gettext-h
stdbool
stdint
+stdlib
sys_select
unistd
diff --git a/modules/pipe-filter-ii b/modules/pipe-filter-ii
index f845a8f5ac..faa4e1a6fb 100644
--- a/modules/pipe-filter-ii
+++ b/modules/pipe-filter-ii
@@ -10,10 +10,11 @@ Depends-on:
spawn-pipe
wait-process
error
-exit
+fcntl-h
gettext-h
stdbool
stdint
+stdlib
sys_select
unistd
diff --git a/modules/pipe2 b/modules/pipe2
index 45813962cb..ca722168a7 100644
--- a/modules/pipe2
+++ b/modules/pipe2
@@ -10,6 +10,7 @@ unistd
fcntl-h
binary-io
extensions
+nonblocking
configure.ac:
gl_FUNC_PIPE2
@@ -22,7 +23,7 @@ Include:
<unistd.h>
License:
-LGPL
+LGPLv2+
Maintainer:
Bruno Haible, Eric Blake
diff --git a/modules/pipe2-tests b/modules/pipe2-tests
index 5d24bd747c..2e6c3f78a7 100644
--- a/modules/pipe2-tests
+++ b/modules/pipe2-tests
@@ -11,3 +11,4 @@ configure.ac:
Makefile.am:
TESTS += test-pipe2
check_PROGRAMS += test-pipe2
+test_pipe2_LDADD = $(LDADD) $(LIBSOCKET)
diff --git a/modules/poll b/modules/poll
index 8690271e0d..478e99ba74 100644
--- a/modules/poll
+++ b/modules/poll
@@ -7,11 +7,11 @@ m4/poll.m4
Depends-on:
poll-h
-alloca
-select
-sys_select
-sys_time
-errno
+alloca [test $HAVE_POLL = 0 || test $REPLACE_POLL = 1]
+select [test $HAVE_POLL = 0 || test $REPLACE_POLL = 1]
+sys_select [test $HAVE_POLL = 0 || test $REPLACE_POLL = 1]
+sys_time [test $HAVE_POLL = 0 || test $REPLACE_POLL = 1]
+errno [test $HAVE_POLL = 0 || test $REPLACE_POLL = 1]
configure.ac:
gl_FUNC_POLL
diff --git a/modules/poll-h b/modules/poll-h
index 8fc15cdb1a..33cad6c097 100644
--- a/modules/poll-h
+++ b/modules/poll-h
@@ -21,7 +21,7 @@ BUILT_SOURCES += poll.h
# We need the following in order to create <poll.h> when the system
# doesn't have one.
-poll.h: poll.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
+poll.h: poll.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''HAVE_POLL_H''@|$(HAVE_POLL_H)|g' \
diff --git a/modules/popen b/modules/popen
index 75e278d8ec..d4ba0ab062 100644
--- a/modules/popen
+++ b/modules/popen
@@ -6,8 +6,8 @@ lib/popen.c
m4/popen.m4
Depends-on:
-open
stdio
+open [test $REPLACE_POPEN = 1]
configure.ac:
gl_FUNC_POPEN
diff --git a/modules/posix_spawn b/modules/posix_spawn
index a4967b9c28..54e08d8413 100644
--- a/modules/posix_spawn
+++ b/modules/posix_spawn
@@ -7,12 +7,11 @@ m4/posix_spawn.m4
Depends-on:
spawn
-posix_spawn-internal
+posix_spawn-internal [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1]
configure.ac:
gl_POSIX_SPAWN
if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
- gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawn])
gl_POSIX_SPAWN_INTERNAL
fi
diff --git a/modules/posix_spawn_file_actions_addclose b/modules/posix_spawn_file_actions_addclose
index 80b1c91536..eef7b63c55 100644
--- a/modules/posix_spawn_file_actions_addclose
+++ b/modules/posix_spawn_file_actions_addclose
@@ -9,12 +9,11 @@ m4/posix_spawn.m4
Depends-on:
spawn
-getdtablesize
+getdtablesize [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1]
configure.ac:
gl_POSIX_SPAWN
if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
- gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawn_faction_addclose])
fi
gl_SPAWN_MODULE_INDICATOR([posix_spawn_file_actions_addclose])
diff --git a/modules/posix_spawn_file_actions_adddup2 b/modules/posix_spawn_file_actions_adddup2
index 173dc64344..1cab62fb9c 100644
--- a/modules/posix_spawn_file_actions_adddup2
+++ b/modules/posix_spawn_file_actions_adddup2
@@ -9,12 +9,11 @@ m4/posix_spawn.m4
Depends-on:
spawn
-getdtablesize
+getdtablesize [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1]
configure.ac:
gl_POSIX_SPAWN
if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
- gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawn_faction_adddup2])
fi
gl_SPAWN_MODULE_INDICATOR([posix_spawn_file_actions_adddup2])
diff --git a/modules/posix_spawn_file_actions_addopen b/modules/posix_spawn_file_actions_addopen
index d621d2df8c..464e6491e8 100644
--- a/modules/posix_spawn_file_actions_addopen
+++ b/modules/posix_spawn_file_actions_addopen
@@ -9,12 +9,11 @@ m4/posix_spawn.m4
Depends-on:
spawn
-getdtablesize
+getdtablesize [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1]
configure.ac:
gl_POSIX_SPAWN
if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
- gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawn_faction_addopen])
fi
gl_SPAWN_MODULE_INDICATOR([posix_spawn_file_actions_addopen])
diff --git a/modules/posix_spawn_file_actions_destroy b/modules/posix_spawn_file_actions_destroy
index 8ca5aa2f11..ae1ea0d886 100644
--- a/modules/posix_spawn_file_actions_destroy
+++ b/modules/posix_spawn_file_actions_destroy
@@ -12,7 +12,6 @@ spawn
configure.ac:
gl_POSIX_SPAWN
if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
- gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawn_faction_destroy])
fi
gl_SPAWN_MODULE_INDICATOR([posix_spawn_file_actions_destroy])
diff --git a/modules/posix_spawn_file_actions_init b/modules/posix_spawn_file_actions_init
index 7431aabcc8..7afc5bef77 100644
--- a/modules/posix_spawn_file_actions_init
+++ b/modules/posix_spawn_file_actions_init
@@ -13,7 +13,6 @@ spawn
configure.ac:
gl_POSIX_SPAWN
if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
- gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawn_faction_init])
fi
gl_SPAWN_MODULE_INDICATOR([posix_spawn_file_actions_init])
diff --git a/modules/posix_spawnattr_destroy b/modules/posix_spawnattr_destroy
index 426b382aba..59fd22bded 100644
--- a/modules/posix_spawnattr_destroy
+++ b/modules/posix_spawnattr_destroy
@@ -12,7 +12,6 @@ spawn
configure.ac:
gl_POSIX_SPAWN
if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
- gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawnattr_destroy])
fi
gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_destroy])
diff --git a/modules/posix_spawnattr_getflags b/modules/posix_spawnattr_getflags
index 47a70dd2b0..ffade0c3d0 100644
--- a/modules/posix_spawnattr_getflags
+++ b/modules/posix_spawnattr_getflags
@@ -12,7 +12,6 @@ spawn
configure.ac:
gl_POSIX_SPAWN
if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
- gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawnattr_getflags])
fi
gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_getflags])
diff --git a/modules/posix_spawnattr_getpgroup b/modules/posix_spawnattr_getpgroup
index 60d62ccae7..58e59d31c1 100644
--- a/modules/posix_spawnattr_getpgroup
+++ b/modules/posix_spawnattr_getpgroup
@@ -12,7 +12,6 @@ spawn
configure.ac:
gl_POSIX_SPAWN
if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
- gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawnattr_getpgroup])
fi
gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_getpgroup])
diff --git a/modules/posix_spawnattr_getschedparam b/modules/posix_spawnattr_getschedparam
index c8cd1e4c71..6767db665c 100644
--- a/modules/posix_spawnattr_getschedparam
+++ b/modules/posix_spawnattr_getschedparam
@@ -14,7 +14,6 @@ gl_POSIX_SPAWN
if test $HAVE_POSIX_SPAWN = 0 \
|| test $REPLACE_POSIX_SPAWN = 1 \
|| test $gl_cv_func_spawnattr_setschedparam = no; then
- gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawnattr_getschedparam])
fi
gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_getschedparam])
diff --git a/modules/posix_spawnattr_getschedpolicy b/modules/posix_spawnattr_getschedpolicy
index a3be8cc239..19188c9cb5 100644
--- a/modules/posix_spawnattr_getschedpolicy
+++ b/modules/posix_spawnattr_getschedpolicy
@@ -14,7 +14,6 @@ gl_POSIX_SPAWN
if test $HAVE_POSIX_SPAWN = 0 \
|| test $REPLACE_POSIX_SPAWN = 1 \
|| test $gl_cv_func_spawnattr_setschedpolicy = no; then
- gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawnattr_getschedpolicy])
fi
gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_getschedpolicy])
diff --git a/modules/posix_spawnattr_getsigdefault b/modules/posix_spawnattr_getsigdefault
index 6a93722eff..980a59acf0 100644
--- a/modules/posix_spawnattr_getsigdefault
+++ b/modules/posix_spawnattr_getsigdefault
@@ -12,7 +12,6 @@ spawn
configure.ac:
gl_POSIX_SPAWN
if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
- gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawnattr_getdefault])
fi
gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_getsigdefault])
diff --git a/modules/posix_spawnattr_getsigmask b/modules/posix_spawnattr_getsigmask
index a984e96ec2..3435de2f25 100644
--- a/modules/posix_spawnattr_getsigmask
+++ b/modules/posix_spawnattr_getsigmask
@@ -12,7 +12,6 @@ spawn
configure.ac:
gl_POSIX_SPAWN
if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
- gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawnattr_getsigmask])
fi
gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_getsigmask])
diff --git a/modules/posix_spawnattr_init b/modules/posix_spawnattr_init
index 796f264208..fd8a11677a 100644
--- a/modules/posix_spawnattr_init
+++ b/modules/posix_spawnattr_init
@@ -12,7 +12,6 @@ spawn
configure.ac:
gl_POSIX_SPAWN
if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
- gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawnattr_init])
fi
gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_init])
diff --git a/modules/posix_spawnattr_setflags b/modules/posix_spawnattr_setflags
index 54cbc991c6..2fad14506d 100644
--- a/modules/posix_spawnattr_setflags
+++ b/modules/posix_spawnattr_setflags
@@ -12,7 +12,6 @@ spawn
configure.ac:
gl_POSIX_SPAWN
if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
- gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawnattr_setflags])
fi
gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_setflags])
diff --git a/modules/posix_spawnattr_setpgroup b/modules/posix_spawnattr_setpgroup
index 6affe367c6..4f00f63a79 100644
--- a/modules/posix_spawnattr_setpgroup
+++ b/modules/posix_spawnattr_setpgroup
@@ -11,7 +11,6 @@ spawn
configure.ac:
gl_POSIX_SPAWN
if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
- gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawnattr_setpgroup])
fi
gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_setpgroup])
diff --git a/modules/posix_spawnattr_setschedparam b/modules/posix_spawnattr_setschedparam
index eb448f80f6..6827501a63 100644
--- a/modules/posix_spawnattr_setschedparam
+++ b/modules/posix_spawnattr_setschedparam
@@ -14,7 +14,6 @@ gl_POSIX_SPAWN
if test $HAVE_POSIX_SPAWN = 0 \
|| test $REPLACE_POSIX_SPAWN = 1 \
|| test $gl_cv_func_spawnattr_setschedparam = no; then
- gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawnattr_setschedparam])
fi
gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_setschedparam])
diff --git a/modules/posix_spawnattr_setschedpolicy b/modules/posix_spawnattr_setschedpolicy
index 44b487b13f..2de648dd24 100644
--- a/modules/posix_spawnattr_setschedpolicy
+++ b/modules/posix_spawnattr_setschedpolicy
@@ -14,7 +14,6 @@ gl_POSIX_SPAWN
if test $HAVE_POSIX_SPAWN = 0 \
|| test $REPLACE_POSIX_SPAWN = 1 \
|| test $gl_cv_func_spawnattr_setschedpolicy = no; then
- gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawnattr_setschedpolicy])
fi
gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_setschedpolicy])
diff --git a/modules/posix_spawnattr_setsigdefault b/modules/posix_spawnattr_setsigdefault
index e9f5bb134a..3d8ec56d0c 100644
--- a/modules/posix_spawnattr_setsigdefault
+++ b/modules/posix_spawnattr_setsigdefault
@@ -12,7 +12,6 @@ spawn
configure.ac:
gl_POSIX_SPAWN
if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
- gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawnattr_setdefault])
fi
gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_setsigdefault])
diff --git a/modules/posix_spawnattr_setsigmask b/modules/posix_spawnattr_setsigmask
index d73840b6a1..5e2bf44964 100644
--- a/modules/posix_spawnattr_setsigmask
+++ b/modules/posix_spawnattr_setsigmask
@@ -12,7 +12,6 @@ spawn
configure.ac:
gl_POSIX_SPAWN
if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
- gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawnattr_setsigmask])
fi
gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_setsigmask])
diff --git a/modules/posix_spawnp b/modules/posix_spawnp
index 1cac784a42..ec6accb82d 100644
--- a/modules/posix_spawnp
+++ b/modules/posix_spawnp
@@ -7,12 +7,11 @@ m4/posix_spawn.m4
Depends-on:
spawn
-posix_spawn-internal
+posix_spawn-internal [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1]
configure.ac:
gl_POSIX_SPAWN
if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
- gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawnp])
gl_POSIX_SPAWN_INTERNAL
fi
diff --git a/modules/pread b/modules/pread
index 4c6e6ecda5..5fcb47ca24 100644
--- a/modules/pread
+++ b/modules/pread
@@ -6,9 +6,10 @@ lib/pread.c
m4/pread.m4
Depends-on:
-extensions
-lseek
unistd
+extensions
+lseek [test $HAVE_PREAD = 0 || test $REPLACE_PREAD = 1]
+read [test $HAVE_PREAD = 0 || test $REPLACE_PREAD = 1]
configure.ac:
gl_FUNC_PREAD
diff --git a/modules/printf-posix b/modules/printf-posix
index 0597ef9c6f..1c763a0c12 100644
--- a/modules/printf-posix
+++ b/modules/printf-posix
@@ -15,8 +15,8 @@ m4/asm-underscore.m4
Depends-on:
stdio
-vfprintf-posix
printf-safe
+vfprintf-posix [test $REPLACE_PRINTF = 1]
configure.ac:
gl_FUNC_PRINTF_POSIX
diff --git a/modules/pt_chown b/modules/pt_chown
index b861331d2a..0002ab79a8 100644
--- a/modules/pt_chown
+++ b/modules/pt_chown
@@ -7,6 +7,7 @@ lib/pty-private.h
Depends-on:
ptsname
+stdlib
configure.ac:
diff --git a/modules/pthread b/modules/pthread
index 7aaaffac40..68551e14b3 100644
--- a/modules/pthread
+++ b/modules/pthread
@@ -20,7 +20,8 @@ BUILT_SOURCES += $(PTHREAD_H)
# We need the following in order to create <pthread.h> when the system
# doesn't have one that works with the given compiler.
-pthread.h: pthread.in.h
+if GL_GENERATE_PTHREAD_H
+pthread.h: pthread.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''HAVE_PTHREAD_H''@|$(HAVE_PTHREAD_H)|g' \
@@ -33,6 +34,10 @@ pthread.h: pthread.in.h
< $(srcdir)/pthread.in.h; \
} > $@-t && \
mv $@-t $@
+else
+pthread.h: $(top_builddir)/config.status
+ rm -f $@
+endif
MOSTLYCLEANFILES += pthread.h pthread.h-t
Include:
diff --git a/modules/ptsname b/modules/ptsname
index d6ae046830..ab14894d3b 100644
--- a/modules/ptsname
+++ b/modules/ptsname
@@ -8,7 +8,7 @@ m4/ptsname.m4
Depends-on:
stdlib
extensions
-ttyname_r
+ttyname_r [test $HAVE_PTSNAME = 0]
configure.ac:
gl_FUNC_PTSNAME
diff --git a/modules/pty b/modules/pty
index f490b344b8..1521d5bafd 100644
--- a/modules/pty
+++ b/modules/pty
@@ -20,7 +20,7 @@ BUILT_SOURCES += pty.h
# We need the following in order to create <pty.h> when the system
# doesn't have one that works with the given compiler.
-pty.h: pty.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
+pty.h: pty.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''HAVE_PTY_H''@|$(HAVE_PTY_H)|g' \
diff --git a/modules/putenv b/modules/putenv
index 3874b541b8..ce28e4c6e9 100644
--- a/modules/putenv
+++ b/modules/putenv
@@ -7,7 +7,7 @@ m4/putenv.m4
Depends-on:
stdlib
-malloc-posix
+malloc-posix [test $REPLACE_PUTENV = 1]
configure.ac:
gl_FUNC_PUTENV
diff --git a/modules/pwrite b/modules/pwrite
index b6511a2099..f2dd02fb23 100644
--- a/modules/pwrite
+++ b/modules/pwrite
@@ -6,9 +6,10 @@ lib/pwrite.c
m4/pwrite.m4
Depends-on:
-extensions
-lseek
unistd
+extensions
+lseek [test $HAVE_PWRITE = 0 || test $REPLACE_PWRITE = 1]
+write [test $HAVE_PWRITE = 0 || test $REPLACE_PWRITE = 1]
configure.ac:
gl_FUNC_PWRITE
diff --git a/modules/read b/modules/read
new file mode 100644
index 0000000000..85a9e02bbf
--- /dev/null
+++ b/modules/read
@@ -0,0 +1,24 @@
+Description:
+POSIX compatible read() function: read data from a file descriptor
+
+Files:
+lib/read.c
+m4/read.m4
+
+Depends-on:
+unistd
+
+configure.ac:
+gl_FUNC_READ
+gl_UNISTD_MODULE_INDICATOR([read])
+
+Makefile.am:
+
+Include:
+<unistd.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+Bruno Haible
diff --git a/modules/readline b/modules/readline
index 933ae5b629..7f2af8f061 100644
--- a/modules/readline
+++ b/modules/readline
@@ -7,8 +7,8 @@ lib/readline.c
m4/readline.m4
Depends-on:
-getline
havelib
+getline [test "$gl_cv_lib_readline" = no]
configure.ac:
gl_FUNC_READLINE
diff --git a/modules/readlink b/modules/readlink
index eb32ef53ee..37c03a78af 100644
--- a/modules/readlink
+++ b/modules/readlink
@@ -6,8 +6,8 @@ lib/readlink.c
m4/readlink.m4
Depends-on:
-stat
unistd
+stat [test $HAVE_READLINK = 0 || test $REPLACE_READLINK = 1]
configure.ac:
gl_FUNC_READLINK
diff --git a/modules/readlinkat b/modules/readlinkat
index 593f2c2573..18f2f959a4 100644
--- a/modules/readlinkat
+++ b/modules/readlinkat
@@ -6,11 +6,11 @@ lib/readlinkat.c
m4/readlinkat.m4
Depends-on:
+unistd
extensions
fcntl-h
-openat
-readlink
-unistd
+openat [test $HAVE_READLINKAT = 0]
+readlink [test $HAVE_READLINKAT = 0]
configure.ac:
gl_FUNC_READLINKAT
diff --git a/modules/readlinkat-tests b/modules/readlinkat-tests
index de23df8dde..96faa5699b 100644
--- a/modules/readlinkat-tests
+++ b/modules/readlinkat-tests
@@ -13,4 +13,3 @@ configure.ac:
Makefile.am:
TESTS += test-readlinkat
check_PROGRAMS += test-readlinkat
-test_readlinkat_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/readme-release b/modules/readme-release
new file mode 100644
index 0000000000..a2128bf49d
--- /dev/null
+++ b/modules/readme-release
@@ -0,0 +1,31 @@
+Description:
+Add release instructions customized for the package.
+
+You should add a line like
+
+perl -pi -e "s/\@PACKAGE\@/$package/g" README-release
+
+to autogen.sh or bootstrap.conf's epilogue function to patch the
+package name in. This is particularly handy for making various URLs
+copy-and-pastable.
+
+Note that, as with any gnulib-tool supplied file, README-release can
+be customized via a .diff file. This is an easy way to add
+package-specific instructions.
+
+Files:
+top/README-release
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+
+Include:
+
+License:
+GPLed build tool
+
+Maintainer:
+bug-gnulib@gnu.org
diff --git a/modules/recv b/modules/recv
index 04602f9801..c225917b17 100644
--- a/modules/recv
+++ b/modules/recv
@@ -7,7 +7,7 @@ lib/w32sock.h
Depends-on:
sys_socket
-errno
+errno [test "$ac_cv_header_winsock2_h" = yes]
configure.ac:
AC_REQUIRE([gl_HEADER_SYS_SOCKET])
diff --git a/modules/recvfrom b/modules/recvfrom
index 8237565b9d..9a6d833ccb 100644
--- a/modules/recvfrom
+++ b/modules/recvfrom
@@ -7,8 +7,8 @@ lib/w32sock.h
Depends-on:
sys_socket
-errno
-getpeername
+errno [test "$ac_cv_header_winsock2_h" = yes]
+getpeername [test "$ac_cv_header_winsock2_h" = yes]
configure.ac:
AC_REQUIRE([gl_HEADER_SYS_SOCKET])
diff --git a/modules/regex b/modules/regex
index 6a8f4c25fd..730076c2b3 100644
--- a/modules/regex
+++ b/modules/regex
@@ -12,23 +12,23 @@ m4/regex.m4
m4/mbstate_t.m4
Depends-on:
-alloca-opt
-btowc
extensions
-gettext-h
-localcharset
-malloc-gnu
-memcmp
-memmove
-mbrtowc
-mbsinit
-nl_langinfo
-stdbool
-stdint
ssize_t
-wchar
-wcrtomb
-wctype-h
+alloca-opt [test $ac_use_included_regex = yes]
+btowc [test $ac_use_included_regex = yes]
+gettext-h [test $ac_use_included_regex = yes]
+localcharset [test $ac_use_included_regex = yes]
+malloc-gnu [test $ac_use_included_regex = yes]
+memcmp [test $ac_use_included_regex = yes]
+memmove [test $ac_use_included_regex = yes]
+mbrtowc [test $ac_use_included_regex = yes]
+mbsinit [test $ac_use_included_regex = yes]
+nl_langinfo [test $ac_use_included_regex = yes]
+stdbool [test $ac_use_included_regex = yes]
+stdint [test $ac_use_included_regex = yes]
+wchar [test $ac_use_included_regex = yes]
+wcrtomb [test $ac_use_included_regex = yes]
+wctype-h [test $ac_use_included_regex = yes]
configure.ac:
gl_REGEX
diff --git a/modules/relocatable-prog-wrapper b/modules/relocatable-prog-wrapper
index b96892952e..8246e56baa 100644
--- a/modules/relocatable-prog-wrapper
+++ b/modules/relocatable-prog-wrapper
@@ -10,6 +10,10 @@ lib/progname.c
lib/progreloc.c
lib/areadlink.h
lib/areadlink.c
+lib/careadlinkat.h
+lib/careadlinkat.c
+lib/allocator.h
+lib/allocator.c
lib/readlink.c
lib/canonicalize-lgpl.c
lib/malloca.h
diff --git a/modules/remove b/modules/remove
index 886a03937f..4723801893 100644
--- a/modules/remove
+++ b/modules/remove
@@ -6,9 +6,9 @@ lib/remove.c
m4/remove.m4
Depends-on:
-rmdir
stdio
-unlink
+rmdir [test $REPLACE_REMOVE = 1]
+unlink [test $REPLACE_REMOVE = 1]
configure.ac:
gl_FUNC_REMOVE
diff --git a/modules/rename b/modules/rename
index ae8390a3ec..449d9beeab 100644
--- a/modules/rename
+++ b/modules/rename
@@ -6,14 +6,14 @@ lib/rename.c
m4/rename.m4
Depends-on:
-canonicalize-lgpl
-dirname-lgpl
-lstat
-rmdir
-same-inode
-stdbool
stdio
-strdup
+canonicalize-lgpl [test $REPLACE_RENAME = 1]
+dirname-lgpl [test $REPLACE_RENAME = 1]
+lstat [test $REPLACE_RENAME = 1]
+rmdir [test $REPLACE_RENAME = 1]
+same-inode [test $REPLACE_RENAME = 1]
+stdbool [test $REPLACE_RENAME = 1]
+strdup [test $REPLACE_RENAME = 1]
configure.ac:
gl_FUNC_RENAME
diff --git a/modules/renameat b/modules/renameat
index 14de04a021..15bc1ecd97 100644
--- a/modules/renameat
+++ b/modules/renameat
@@ -7,14 +7,15 @@ lib/renameat.c
m4/renameat.m4
Depends-on:
+stdio
extensions
fcntl-h
-filenamecat-lgpl
-openat
-rename
-same-inode
-stdio
-stpcpy
+filenamecat-lgpl [test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1]
+getcwd-lgpl [test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1]
+openat [test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1]
+rename [test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1]
+same-inode [test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1]
+stpcpy [test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1]
configure.ac:
gl_FUNC_RENAMEAT
diff --git a/modules/renameat-tests b/modules/renameat-tests
index dcef7c19d0..9e7b337d79 100644
--- a/modules/renameat-tests
+++ b/modules/renameat-tests
@@ -7,8 +7,8 @@ tests/macros.h
Depends-on:
ignore-value
filenamecat
+getcwd-lgpl
progname
-xgetcwd
configure.ac:
diff --git a/modules/rmdir b/modules/rmdir
index eaa5a68542..95e7b1df6a 100644
--- a/modules/rmdir
+++ b/modules/rmdir
@@ -6,9 +6,9 @@ lib/rmdir.c
m4/rmdir.m4
Depends-on:
-dosname
-sys_stat
unistd
+dosname [test $REPLACE_RMDIR = 1]
+sys_stat [test $REPLACE_RMDIR = 1]
configure.ac:
gl_FUNC_RMDIR
diff --git a/modules/round b/modules/round
index c4acba133f..07dcd880b7 100644
--- a/modules/round
+++ b/modules/round
@@ -9,10 +9,10 @@ m4/floor.m4
m4/ceil.m4
Depends-on:
-float
-floor
math
extensions
+float [test $HAVE_DECL_ROUND = 0 || test $REPLACE_ROUND = 1]
+floor [test $HAVE_DECL_ROUND = 0 || test $REPLACE_ROUND = 1]
configure.ac:
gl_FUNC_ROUND
diff --git a/modules/roundf b/modules/roundf
index d77b2a198d..d9c283eb33 100644
--- a/modules/roundf
+++ b/modules/roundf
@@ -10,9 +10,9 @@ m4/floorf.m4
m4/ceilf.m4
Depends-on:
-float
math
extensions
+float [test $HAVE_DECL_ROUNDF = 0 || test $REPLACE_ROUNDF = 1]
configure.ac:
gl_FUNC_ROUNDF
diff --git a/modules/roundl b/modules/roundl
index 9eb9f1de54..516ee0b5df 100644
--- a/modules/roundl
+++ b/modules/roundl
@@ -10,9 +10,9 @@ m4/floorl.m4
m4/ceill.m4
Depends-on:
-float
math
extensions
+float [test $HAVE_DECL_ROUNDL = 0 || test $REPLACE_ROUNDL = 1]
configure.ac:
gl_FUNC_ROUNDL
diff --git a/modules/rpmatch b/modules/rpmatch
index 17a6c2083a..bfa5380da1 100644
--- a/modules/rpmatch
+++ b/modules/rpmatch
@@ -8,10 +8,10 @@ m4/rpmatch.m4
Depends-on:
stdlib
extensions
-stdbool
-gettext-h
-regex
-strdup
+stdbool [test $HAVE_RPMATCH = 0]
+gettext-h [test $HAVE_RPMATCH = 0]
+regex [test $HAVE_RPMATCH = 0]
+strdup [test $HAVE_RPMATCH = 0]
configure.ac:
gl_FUNC_RPMATCH
diff --git a/modules/safe-read b/modules/safe-read
index 533d83bbf7..89e79a9b67 100644
--- a/modules/safe-read
+++ b/modules/safe-read
@@ -7,6 +7,7 @@ lib/safe-read.c
m4/safe-read.m4
Depends-on:
+read
ssize_t
configure.ac:
diff --git a/modules/safe-write b/modules/safe-write
index 137c94a63e..cdc80d21f5 100644
--- a/modules/safe-write
+++ b/modules/safe-write
@@ -4,10 +4,12 @@ An interface to the write() function that retries after interrupts.
Files:
lib/safe-write.h
lib/safe-write.c
+lib/safe-read.c
m4/safe-write.m4
+m4/safe-read.m4
Depends-on:
-safe-read
+ssize_t
write
configure.ac:
diff --git a/modules/save-cwd b/modules/save-cwd
index 02a0723391..974b5962c1 100644
--- a/modules/save-cwd
+++ b/modules/save-cwd
@@ -9,7 +9,7 @@ m4/save-cwd.m4
Depends-on:
chdir-long
cloexec
-getcwd
+getcwd-lgpl
fchdir
stdbool
unistd-safer
diff --git a/modules/savewd b/modules/savewd
index 1f32372849..1e95b4127d 100644
--- a/modules/savewd
+++ b/modules/savewd
@@ -9,12 +9,12 @@ m4/savewd.m4
Depends-on:
dosname
errno
-exit
fchdir
fcntl-safer
fcntl-h
raise
stdbool
+stdlib
xalloc
configure.ac:
diff --git a/modules/sched b/modules/sched
index 128ec35eec..c0c0d6c5ca 100644
--- a/modules/sched
+++ b/modules/sched
@@ -19,7 +19,8 @@ BUILT_SOURCES += $(SCHED_H)
# We need the following in order to create a replacement for <sched.h> when
# the system doesn't have one.
-sched.h: sched.in.h
+if GL_GENERATE_SCHED_H
+sched.h: sched.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''HAVE_SCHED_H''@|$(HAVE_SCHED_H)|g' \
@@ -31,6 +32,10 @@ sched.h: sched.in.h
< $(srcdir)/sched.in.h; \
} > $@-t && \
mv $@-t $@
+else
+sched.h: $(top_builddir)/config.status
+ rm -f $@
+endif
MOSTLYCLEANFILES += sched.h sched.h-t
Include:
diff --git a/modules/search b/modules/search
index 3f7ecc060c..b303b249f7 100644
--- a/modules/search
+++ b/modules/search
@@ -21,7 +21,7 @@ BUILT_SOURCES += search.h
# We need the following in order to create <search.h> when the system
# doesn't have one that works with the given compiler.
-search.h: search.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+search.h: search.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
sed -e 's|@''HAVE_SEARCH_H''@|$(HAVE_SEARCH_H)|g' \
diff --git a/modules/select b/modules/select
index 18865f1423..ab4af6e7cb 100644
--- a/modules/select
+++ b/modules/select
@@ -6,9 +6,9 @@ lib/select.c
m4/select.m4
Depends-on:
-alloca
-sockets
sys_select
+alloca [test "$ac_cv_header_winsock2_h" = yes || test $REPLACE_SELECT = 1]
+sockets [test "$ac_cv_header_winsock2_h" = yes || test $REPLACE_SELECT = 1]
configure.ac:
gl_FUNC_SELECT
diff --git a/modules/selinux-h b/modules/selinux-h
index 589729df3a..f919efc802 100644
--- a/modules/selinux-h
+++ b/modules/selinux-h
@@ -23,7 +23,7 @@ nobase_nodist_pkginclude_HEADERS += selinux/selinux.h
lib_SOURCES += se-context.in.h se-selinux.in.h
BUILT_SOURCES += selinux/selinux.h
-selinux/selinux.h: se-selinux.in.h $(UNUSED_PARAMETER_H)
+selinux/selinux.h: se-selinux.in.h $(top_builddir)/config.status $(UNUSED_PARAMETER_H)
$(AM_V_at)$(MKDIR_P) selinux
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
@@ -39,7 +39,8 @@ selinux/selinux.h: se-selinux.in.h $(UNUSED_PARAMETER_H)
MOSTLYCLEANFILES += selinux/selinux.h selinux/selinux.h-t
BUILT_SOURCES += $(SELINUX_CONTEXT_H)
-selinux/context.h: se-context.in.h $(UNUSED_PARAMETER_H)
+if GL_GENERATE_SELINUX_CONTEXT_H
+selinux/context.h: se-context.in.h $(top_builddir)/config.status $(UNUSED_PARAMETER_H)
$(AM_V_at)$(MKDIR_P) selinux
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
@@ -48,6 +49,10 @@ selinux/context.h: se-context.in.h $(UNUSED_PARAMETER_H)
} > $@-t && \
chmod a-x $@-t && \
mv $@-t $@
+else
+selinux/context.h: $(top_builddir)/config.status
+ rm -f $@
+endif
MOSTLYCLEANFILES += selinux/context.h selinux/context.h-t
MOSTLYCLEANDIRS += selinux
diff --git a/modules/send b/modules/send
index 4317d6fb91..8a07da9d46 100644
--- a/modules/send
+++ b/modules/send
@@ -7,7 +7,7 @@ lib/w32sock.h
Depends-on:
sys_socket
-errno
+errno [test "$ac_cv_header_winsock2_h" = yes]
configure.ac:
AC_REQUIRE([gl_HEADER_SYS_SOCKET])
diff --git a/modules/sendto b/modules/sendto
index d9a292c857..b28a7ea354 100644
--- a/modules/sendto
+++ b/modules/sendto
@@ -7,7 +7,7 @@ lib/w32sock.h
Depends-on:
sys_socket
-errno
+errno [test "$ac_cv_header_winsock2_h" = yes]
configure.ac:
AC_REQUIRE([gl_HEADER_SYS_SOCKET])
diff --git a/modules/setenv b/modules/setenv
index 8112616221..95ff0a0e3d 100644
--- a/modules/setenv
+++ b/modules/setenv
@@ -7,10 +7,10 @@ m4/setenv.m4
Depends-on:
stdlib
-malloca
-alloca-opt
-unistd
-environ
+malloca [test $HAVE_SETENV = 0 || test $REPLACE_SETENV = 1]
+alloca-opt [test $HAVE_SETENV = 0 || test $REPLACE_SETENV = 1]
+unistd [test $HAVE_SETENV = 0 || test $REPLACE_SETENV = 1]
+environ [test $HAVE_SETENV = 0 || test $REPLACE_SETENV = 1]
configure.ac:
gl_FUNC_SETENV
diff --git a/modules/setlocale b/modules/setlocale
index 5d3e58b208..918a037da3 100644
--- a/modules/setlocale
+++ b/modules/setlocale
@@ -7,7 +7,7 @@ m4/setlocale.m4
Depends-on:
locale
-localename
+localename [test $REPLACE_SETLOCALE = 1]
configure.ac:
gl_FUNC_SETLOCALE
diff --git a/modules/setsockopt b/modules/setsockopt
index b429510a01..33726b11b9 100644
--- a/modules/setsockopt
+++ b/modules/setsockopt
@@ -7,8 +7,8 @@ lib/w32sock.h
Depends-on:
sys_socket
-sys_time
-errno
+sys_time [test "$ac_cv_header_winsock2_h" = yes]
+errno [test "$ac_cv_header_winsock2_h" = yes]
configure.ac:
AC_REQUIRE([gl_HEADER_SYS_SOCKET])
diff --git a/modules/shutdown b/modules/shutdown
index c1e062104d..322ff8d891 100644
--- a/modules/shutdown
+++ b/modules/shutdown
@@ -7,7 +7,7 @@ lib/w32sock.h
Depends-on:
sys_socket
-errno
+errno [test "$ac_cv_header_winsock2_h" = yes]
configure.ac:
AC_REQUIRE([gl_HEADER_SYS_SOCKET])
diff --git a/modules/sigaction b/modules/sigaction
index 0e42e94487..93b848aca7 100644
--- a/modules/sigaction
+++ b/modules/sigaction
@@ -8,7 +8,7 @@ m4/sigaction.m4
Depends-on:
signal
-sigprocmask
+sigprocmask [test $HAVE_SIGACTION = 0]
configure.ac:
gl_SIGACTION
diff --git a/modules/signal b/modules/signal
index ed9b14737e..d9d101777c 100644
--- a/modules/signal
+++ b/modules/signal
@@ -10,6 +10,7 @@ arg-nonnull
c++defs
include_next
warn-on-use
+extensions
configure.ac:
gl_SIGNAL_H
@@ -21,7 +22,7 @@ BUILT_SOURCES += signal.h
# We need the following in order to create <signal.h> when the system
# doesn't have a complete one.
-signal.h: signal.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+signal.h: signal.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@@ -37,6 +38,7 @@ signal.h: signal.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
-e 's|@''HAVE_SIGACTION''@|$(HAVE_SIGACTION)|g' \
-e 's|@''HAVE_STRUCT_SIGACTION_SA_SIGACTION''@|$(HAVE_STRUCT_SIGACTION_SA_SIGACTION)|g' \
-e 's|@''HAVE_TYPE_VOLATILE_SIG_ATOMIC_T''@|$(HAVE_TYPE_VOLATILE_SIG_ATOMIC_T)|g' \
+ -e 's|@''HAVE_SIGHANDLER_T''@|$(HAVE_SIGHANDLER_T)|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)' \
diff --git a/modules/signbit b/modules/signbit
index 14a5754539..b3ad38836b 100644
--- a/modules/signbit
+++ b/modules/signbit
@@ -9,13 +9,13 @@ lib/float+.h
m4/signbit.m4
Depends-on:
-float
math
-isnanf-nolibm
-isnand-nolibm
-isnanl-nolibm
-fpieee
-memcmp
+float [test $REPLACE_SIGNBIT = 1]
+isnanf-nolibm [test $REPLACE_SIGNBIT = 1]
+isnand-nolibm [test $REPLACE_SIGNBIT = 1]
+isnanl-nolibm [test $REPLACE_SIGNBIT = 1]
+fpieee [test $REPLACE_SIGNBIT = 1]
+memcmp [test $REPLACE_SIGNBIT = 1]
configure.ac:
gl_SIGNBIT
diff --git a/modules/sigprocmask b/modules/sigprocmask
index e46abc97ac..fee745fa68 100644
--- a/modules/sigprocmask
+++ b/modules/sigprocmask
@@ -7,8 +7,8 @@ m4/signalblocking.m4
Depends-on:
signal
-stdint
-raise
+stdint [test $HAVE_POSIX_SIGNALBLOCKING = 0]
+raise [test $HAVE_POSIX_SIGNALBLOCKING = 0]
configure.ac:
gl_SIGNALBLOCKING
diff --git a/modules/sinl b/modules/sinl
index 67621ed316..7f2007a948 100644
--- a/modules/sinl
+++ b/modules/sinl
@@ -11,10 +11,10 @@ m4/sinl.m4
Depends-on:
math
extensions
-float
-isnanl
-floor
-floorl
+float [test $HAVE_SINL = 0]
+isnanl [test $HAVE_SINL = 0]
+floor [test $HAVE_SINL = 0]
+floorl [test $HAVE_SINL = 0]
configure.ac:
gl_FUNC_SINL
@@ -29,7 +29,7 @@ Link:
$(SINL_LIBM)
License:
-GPL
+LGPL
Maintainer:
Paolo Bonzini
diff --git a/modules/sleep b/modules/sleep
index e859e59e52..c9b6c40809 100644
--- a/modules/sleep
+++ b/modules/sleep
@@ -6,9 +6,9 @@ lib/sleep.c
m4/sleep.m4
Depends-on:
-stdint
unistd
-verify
+stdint [test $HAVE_SLEEP = 0 || test $REPLACE_SLEEP = 1]
+verify [test $HAVE_SLEEP = 0 || test $REPLACE_SLEEP = 1]
configure.ac:
gl_FUNC_SLEEP
diff --git a/modules/snprintf b/modules/snprintf
index e8b5dfb47b..cd048aa646 100644
--- a/modules/snprintf
+++ b/modules/snprintf
@@ -8,8 +8,8 @@ m4/printf.m4
Depends-on:
stdio
-vasnprintf
-errno
+vasnprintf [test $ac_cv_func_snprintf = no || test $REPLACE_SNPRINTF = 1]
+errno [test $ac_cv_func_snprintf = no || test $REPLACE_SNPRINTF = 1]
configure.ac:
gl_FUNC_SNPRINTF
diff --git a/modules/snprintf-posix b/modules/snprintf-posix
index 16b38b7dde..874ba5a46f 100644
--- a/modules/snprintf-posix
+++ b/modules/snprintf-posix
@@ -14,18 +14,18 @@ m4/printf.m4
Depends-on:
snprintf
-vasnprintf
-isnand-nolibm
-isnanl-nolibm
-frexp-nolibm
-frexpl-nolibm
-printf-frexp
-printf-frexpl
-signbit
-fpucw
nocrash
printf-safe
multiarch
+vasnprintf [test $ac_cv_func_snprintf = no || test $REPLACE_SNPRINTF = 1]
+isnand-nolibm [test $ac_cv_func_snprintf = no || test $REPLACE_SNPRINTF = 1]
+isnanl-nolibm [test $ac_cv_func_snprintf = no || test $REPLACE_SNPRINTF = 1]
+frexp-nolibm [test $ac_cv_func_snprintf = no || test $REPLACE_SNPRINTF = 1]
+frexpl-nolibm [test $ac_cv_func_snprintf = no || test $REPLACE_SNPRINTF = 1]
+printf-frexp [test $ac_cv_func_snprintf = no || test $REPLACE_SNPRINTF = 1]
+printf-frexpl [test $ac_cv_func_snprintf = no || test $REPLACE_SNPRINTF = 1]
+signbit [test $ac_cv_func_snprintf = no || test $REPLACE_SNPRINTF = 1]
+fpucw [test $ac_cv_func_snprintf = no || test $REPLACE_SNPRINTF = 1]
configure.ac:
gl_FUNC_SNPRINTF_POSIX
diff --git a/modules/socket b/modules/socket
index f5daa4919b..92df980466 100644
--- a/modules/socket
+++ b/modules/socket
@@ -7,8 +7,8 @@ lib/w32sock.h
Depends-on:
sys_socket
-errno
-sockets
+errno [test "$ac_cv_header_winsock2_h" = yes]
+sockets [test "$ac_cv_header_winsock2_h" = yes]
configure.ac:
AC_REQUIRE([gl_HEADER_SYS_SOCKET])
diff --git a/modules/sockets b/modules/sockets
index b79a02fb7c..fe9292631c 100644
--- a/modules/sockets
+++ b/modules/sockets
@@ -10,7 +10,7 @@ m4/sockets.m4
Depends-on:
socketlib
sys_socket
-close-hook
+fd-hook
configure.ac:
gl_SOCKETS
diff --git a/modules/spawn b/modules/spawn
index eb0d4c13a6..a0e2a930fe 100644
--- a/modules/spawn
+++ b/modules/spawn
@@ -22,7 +22,7 @@ BUILT_SOURCES += spawn.h
# We need the following in order to create a replacement for <spawn.h> when
# the system doesn't have one.
-spawn.h: spawn.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+spawn.h: spawn.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''HAVE_SPAWN_H''@|$(HAVE_SPAWN_H)|g' \
diff --git a/modules/spawn-pipe b/modules/spawn-pipe
index 04441b1a4e..9898b37598 100644
--- a/modules/spawn-pipe
+++ b/modules/spawn-pipe
@@ -12,7 +12,6 @@ cloexec
dup2
environ
error
-exit
fatal-signal
gettext-h
open
@@ -30,6 +29,7 @@ posix_spawnattr_setsigmask
posix_spawnattr_setflags
posix_spawnattr_destroy
stdbool
+stdlib
strpbrk
unistd
unistd-safer
diff --git a/modules/sprintf-posix b/modules/sprintf-posix
index b5f02f6aaf..cdcc8aa510 100644
--- a/modules/sprintf-posix
+++ b/modules/sprintf-posix
@@ -14,20 +14,20 @@ m4/printf.m4
Depends-on:
stdio
-vasnprintf
-isnand-nolibm
-isnanl-nolibm
-frexp-nolibm
-frexpl-nolibm
-printf-frexp
-printf-frexpl
-signbit
-fpucw
nocrash
printf-safe
-stdint
-errno
multiarch
+vasnprintf [test $REPLACE_SPRINTF = 1]
+isnand-nolibm [test $REPLACE_SPRINTF = 1]
+isnanl-nolibm [test $REPLACE_SPRINTF = 1]
+frexp-nolibm [test $REPLACE_SPRINTF = 1]
+frexpl-nolibm [test $REPLACE_SPRINTF = 1]
+printf-frexp [test $REPLACE_SPRINTF = 1]
+printf-frexpl [test $REPLACE_SPRINTF = 1]
+signbit [test $REPLACE_SPRINTF = 1]
+fpucw [test $REPLACE_SPRINTF = 1]
+stdint [test $REPLACE_SPRINTF = 1]
+errno [test $REPLACE_SPRINTF = 1]
configure.ac:
gl_FUNC_SPRINTF_POSIX
diff --git a/modules/sqrtl b/modules/sqrtl
index d4886665af..d7f73cac92 100644
--- a/modules/sqrtl
+++ b/modules/sqrtl
@@ -8,11 +8,11 @@ m4/sqrtl.m4
Depends-on:
math
extensions
-float
-isnanl
-frexpl
-ldexpl
-sqrt
+float [test $HAVE_SQRTL = 0]
+isnanl [test $HAVE_SQRTL = 0]
+frexpl [test $HAVE_SQRTL = 0]
+ldexpl [test $HAVE_SQRTL = 0]
+sqrt [test $HAVE_SQRTL = 0]
configure.ac:
gl_FUNC_SQRTL
@@ -27,7 +27,7 @@ Link:
$(SQRTL_LIBM)
License:
-GPL
+LGPL
Maintainer:
Paolo Bonzini
diff --git a/modules/stat b/modules/stat
index 744aa7a0cb..db179aa38f 100644
--- a/modules/stat
+++ b/modules/stat
@@ -6,9 +6,9 @@ lib/stat.c
m4/stat.m4
Depends-on:
-dosname
-stdbool
sys_stat
+dosname [test $REPLACE_STAT = 1]
+stdbool [test $REPLACE_STAT = 1]
configure.ac:
gl_FUNC_STAT
diff --git a/modules/stdarg b/modules/stdarg
index 105a54c52d..92072e380f 100644
--- a/modules/stdarg
+++ b/modules/stdarg
@@ -26,7 +26,8 @@ BUILT_SOURCES += $(STDARG_H)
# We need the following in order to create <stdarg.h> when the system
# doesn't have one that works with the given compiler.
-stdarg.h: stdarg.in.h
+if GL_GENERATE_STDARG_H
+stdarg.h: stdarg.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@@ -36,6 +37,10 @@ stdarg.h: stdarg.in.h
< $(srcdir)/stdarg.in.h; \
} > $@-t && \
mv $@-t $@
+else
+stdarg.h: $(top_builddir)/config.status
+ rm -f $@
+endif
MOSTLYCLEANFILES += stdarg.h stdarg.h-t
Include:
diff --git a/modules/stdbool b/modules/stdbool
index 5c1fe3ce36..b15aee7d72 100644
--- a/modules/stdbool
+++ b/modules/stdbool
@@ -19,12 +19,17 @@ BUILT_SOURCES += $(STDBOOL_H)
# We need the following in order to create <stdbool.h> when the system
# doesn't have one that works.
-stdbool.h: stdbool.in.h
+if GL_GENERATE_STDBOOL_H
+stdbool.h: stdbool.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool.in.h; \
} > $@-t && \
mv $@-t $@
+else
+stdbool.h: $(top_builddir)/config.status
+ rm -f $@
+endif
MOSTLYCLEANFILES += stdbool.h stdbool.h-t
Include:
diff --git a/modules/stddef b/modules/stddef
index 62e874a3cf..0909fc1ad5 100644
--- a/modules/stddef
+++ b/modules/stddef
@@ -20,7 +20,8 @@ BUILT_SOURCES += $(STDDEF_H)
# We need the following in order to create <stddef.h> when the system
# doesn't have one that works with the given compiler.
-stddef.h: stddef.in.h
+if GL_GENERATE_STDDEF_H
+stddef.h: stddef.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@@ -32,6 +33,10 @@ stddef.h: stddef.in.h
< $(srcdir)/stddef.in.h; \
} > $@-t && \
mv $@-t $@
+else
+stddef.h: $(top_builddir)/config.status
+ rm -f $@
+endif
MOSTLYCLEANFILES += stddef.h stddef.h-t
Include:
diff --git a/modules/stdint b/modules/stdint
index 76d8e7ea7c..da69a3d557 100644
--- a/modules/stdint
+++ b/modules/stdint
@@ -26,7 +26,8 @@ BUILT_SOURCES += $(STDINT_H)
# We need the following in order to create <stdint.h> when the system
# doesn't have one that works with the given compiler.
-stdint.h: stdint.in.h
+if GL_GENERATE_STDINT_H
+stdint.h: stdint.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
@@ -58,6 +59,10 @@ stdint.h: stdint.in.h
< $(srcdir)/stdint.in.h; \
} > $@-t && \
mv $@-t $@
+else
+stdint.h: $(top_builddir)/config.status
+ rm -f $@
+endif
MOSTLYCLEANFILES += stdint.h stdint.h-t
Include:
diff --git a/modules/stdint-tests b/modules/stdint-tests
index ad320b2296..d83cd4c06d 100644
--- a/modules/stdint-tests
+++ b/modules/stdint-tests
@@ -6,6 +6,7 @@ m4/wint_t.m4
Depends-on:
verify
intprops
+wchar
configure.ac:
gt_TYPE_WCHAR_T
diff --git a/modules/stdio b/modules/stdio
index c42a34f25b..c7065cc11e 100644
--- a/modules/stdio
+++ b/modules/stdio
@@ -22,7 +22,7 @@ BUILT_SOURCES += stdio.h
# We need the following in order to create <stdio.h> when the system
# doesn't have one that works with the given compiler.
-stdio.h: stdio.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@@ -32,20 +32,27 @@ stdio.h: stdio.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
-e 's|@''GNULIB_DPRINTF''@|$(GNULIB_DPRINTF)|g' \
-e 's|@''GNULIB_FCLOSE''@|$(GNULIB_FCLOSE)|g' \
-e 's|@''GNULIB_FFLUSH''@|$(GNULIB_FFLUSH)|g' \
+ -e 's|@''GNULIB_FGETC''@|$(GNULIB_FGETC)|g' \
+ -e 's|@''GNULIB_FGETS''@|$(GNULIB_FGETS)|g' \
-e 's|@''GNULIB_FOPEN''@|$(GNULIB_FOPEN)|g' \
-e 's|@''GNULIB_FPRINTF''@|$(GNULIB_FPRINTF)|g' \
-e 's|@''GNULIB_FPRINTF_POSIX''@|$(GNULIB_FPRINTF_POSIX)|g' \
-e 's|@''GNULIB_FPURGE''@|$(GNULIB_FPURGE)|g' \
-e 's|@''GNULIB_FPUTC''@|$(GNULIB_FPUTC)|g' \
-e 's|@''GNULIB_FPUTS''@|$(GNULIB_FPUTS)|g' \
+ -e 's|@''GNULIB_FREAD''@|$(GNULIB_FREAD)|g' \
-e 's|@''GNULIB_FREOPEN''@|$(GNULIB_FREOPEN)|g' \
+ -e 's|@''GNULIB_FSCANF''@|$(GNULIB_FSCANF)|g' \
-e 's|@''GNULIB_FSEEK''@|$(GNULIB_FSEEK)|g' \
-e 's|@''GNULIB_FSEEKO''@|$(GNULIB_FSEEKO)|g' \
-e 's|@''GNULIB_FTELL''@|$(GNULIB_FTELL)|g' \
-e 's|@''GNULIB_FTELLO''@|$(GNULIB_FTELLO)|g' \
-e 's|@''GNULIB_FWRITE''@|$(GNULIB_FWRITE)|g' \
+ -e 's|@''GNULIB_GETC''@|$(GNULIB_GETC)|g' \
+ -e 's|@''GNULIB_GETCHAR''@|$(GNULIB_GETCHAR)|g' \
-e 's|@''GNULIB_GETDELIM''@|$(GNULIB_GETDELIM)|g' \
-e 's|@''GNULIB_GETLINE''@|$(GNULIB_GETLINE)|g' \
+ -e 's|@''GNULIB_GETS''@|$(GNULIB_GETS)|g' \
-e 's|@''GNULIB_OBSTACK_PRINTF''@|$(GNULIB_OBSTACK_PRINTF)|g' \
-e 's|@''GNULIB_OBSTACK_PRINTF_POSIX''@|$(GNULIB_OBSTACK_PRINTF_POSIX)|g' \
-e 's|@''GNULIB_PERROR''@|$(GNULIB_PERROR)|g' \
@@ -58,14 +65,18 @@ stdio.h: stdio.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
-e 's|@''GNULIB_REMOVE''@|$(GNULIB_REMOVE)|g' \
-e 's|@''GNULIB_RENAME''@|$(GNULIB_RENAME)|g' \
-e 's|@''GNULIB_RENAMEAT''@|$(GNULIB_RENAMEAT)|g' \
+ -e 's|@''GNULIB_SCANF''@|$(GNULIB_SCANF)|g' \
-e 's|@''GNULIB_SNPRINTF''@|$(GNULIB_SNPRINTF)|g' \
-e 's|@''GNULIB_SPRINTF_POSIX''@|$(GNULIB_SPRINTF_POSIX)|g' \
+ -e 's|@''GNULIB_STDIO_H_NONBLOCKING''@|$(GNULIB_STDIO_H_NONBLOCKING)|g' \
-e 's|@''GNULIB_STDIO_H_SIGPIPE''@|$(GNULIB_STDIO_H_SIGPIPE)|g' \
-e 's|@''GNULIB_TMPFILE''@|$(GNULIB_TMPFILE)|g' \
-e 's|@''GNULIB_VASPRINTF''@|$(GNULIB_VASPRINTF)|g' \
-e 's|@''GNULIB_VDPRINTF''@|$(GNULIB_VDPRINTF)|g' \
-e 's|@''GNULIB_VFPRINTF''@|$(GNULIB_VFPRINTF)|g' \
-e 's|@''GNULIB_VFPRINTF_POSIX''@|$(GNULIB_VFPRINTF_POSIX)|g' \
+ -e 's|@''GNULIB_VFSCANF''@|$(GNULIB_VFSCANF)|g' \
+ -e 's|@''GNULIB_VSCANF''@|$(GNULIB_VSCANF)|g' \
-e 's|@''GNULIB_VPRINTF''@|$(GNULIB_VPRINTF)|g' \
-e 's|@''GNULIB_VPRINTF_POSIX''@|$(GNULIB_VPRINTF_POSIX)|g' \
-e 's|@''GNULIB_VSNPRINTF''@|$(GNULIB_VSNPRINTF)|g' \
@@ -107,6 +118,7 @@ stdio.h: stdio.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
-e 's|@''REPLACE_RENAMEAT''@|$(REPLACE_RENAMEAT)|g' \
-e 's|@''REPLACE_SNPRINTF''@|$(REPLACE_SNPRINTF)|g' \
-e 's|@''REPLACE_SPRINTF''@|$(REPLACE_SPRINTF)|g' \
+ -e 's|@''REPLACE_STDIO_READ_FUNCS''@|$(REPLACE_STDIO_READ_FUNCS)|g' \
-e 's|@''REPLACE_STDIO_WRITE_FUNCS''@|$(REPLACE_STDIO_WRITE_FUNCS)|g' \
-e 's|@''REPLACE_TMPFILE''@|$(REPLACE_TMPFILE)|g' \
-e 's|@''REPLACE_VASPRINTF''@|$(REPLACE_VASPRINTF)|g' \
diff --git a/modules/stdlib b/modules/stdlib
index f00a862bd4..33766ac229 100644
--- a/modules/stdlib
+++ b/modules/stdlib
@@ -23,7 +23,7 @@ BUILT_SOURCES += stdlib.h
# We need the following in order to create <stdlib.h> when the system
# doesn't have one that works with the given compiler.
-stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
diff --git a/modules/strcase b/modules/strcase
index 0023f46794..0c91e06c4f 100644
--- a/modules/strcase
+++ b/modules/strcase
@@ -1,6 +1,12 @@
Description:
Case-insensitive string comparison functions.
+Status:
+obsolete
+
+Notice:
+This module is obsolete.
+
Files:
lib/strcasecmp.c
lib/strncasecmp.c
diff --git a/modules/strchrnul b/modules/strchrnul
index 8ae3ea6fb2..59c4cc68ab 100644
--- a/modules/strchrnul
+++ b/modules/strchrnul
@@ -8,9 +8,9 @@ lib/strchrnul.valgrind
m4/strchrnul.m4
Depends-on:
-extensions
string
-rawmemchr
+extensions
+rawmemchr [test $HAVE_STRCHRNUL = 0 || test $REPLACE_STRCHRNUL = 1]
configure.ac:
gl_FUNC_STRCHRNUL
diff --git a/modules/strdup-posix b/modules/strdup-posix
index 4a474881b3..d158873fbe 100644
--- a/modules/strdup-posix
+++ b/modules/strdup-posix
@@ -7,7 +7,7 @@ m4/strdup.m4
Depends-on:
string
-malloc-posix
+malloc-posix [test $ac_cv_func_strdup = no || test $REPLACE_STRDUP = 1]
configure.ac:
gl_FUNC_STRDUP_POSIX
diff --git a/modules/strerror b/modules/strerror
index 1a204fa09e..cd14d12576 100644
--- a/modules/strerror
+++ b/modules/strerror
@@ -6,9 +6,9 @@ lib/strerror.c
m4/strerror.m4
Depends-on:
-errno
-intprops
string
+errno [test $REPLACE_STRERROR = 1]
+intprops [test $REPLACE_STRERROR = 1]
configure.ac:
gl_FUNC_STRERROR
diff --git a/modules/strerror_r-posix b/modules/strerror_r-posix
index 1a1d8c6dd8..75345ed123 100644
--- a/modules/strerror_r-posix
+++ b/modules/strerror_r-posix
@@ -7,10 +7,10 @@ m4/strerror_r.m4
Depends-on:
string
-errno
extensions
-lock
-strerror
+errno [test $HAVE_DECL_STRERROR_R = 0 || test $REPLACE_STRERROR_R = 1]
+lock [test $HAVE_DECL_STRERROR_R = 0 || test $REPLACE_STRERROR_R = 1]
+strerror [test $HAVE_DECL_STRERROR_R = 0 || test $REPLACE_STRERROR_R = 1]
configure.ac:
gl_FUNC_STRERROR_R
diff --git a/modules/strftime-tests b/modules/strftime-tests
index 96ad21334a..20bc7cd1e3 100644
--- a/modules/strftime-tests
+++ b/modules/strftime-tests
@@ -3,7 +3,6 @@ tests/test-strftime.c
tests/macros.h
Depends-on:
-strftime
configure.ac:
diff --git a/modules/string b/modules/string
index c109bca5c4..68ac30db06 100644
--- a/modules/string
+++ b/modules/string
@@ -23,7 +23,7 @@ BUILT_SOURCES += string.h
# We need the following in order to create <string.h> when the system
# doesn't have one that works with the given compiler.
-string.h: string.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@@ -89,6 +89,7 @@ string.h: string.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
-e 's|@''REPLACE_MEMCHR''@|$(REPLACE_MEMCHR)|g' \
-e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \
-e 's|@''REPLACE_STRCASESTR''@|$(REPLACE_STRCASESTR)|g' \
+ -e 's|@''REPLACE_STRCHRNUL''@|$(REPLACE_STRCHRNUL)|g' \
-e 's|@''REPLACE_STRDUP''@|$(REPLACE_STRDUP)|g' \
-e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \
-e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \
diff --git a/modules/strings b/modules/strings
index e5ef663942..b595e57459 100644
--- a/modules/strings
+++ b/modules/strings
@@ -20,7 +20,7 @@ BUILT_SOURCES += strings.h
# We need the following in order to create <strings.h> when the system
# doesn't have one that works with the given compiler.
-strings.h: strings.in.h $(WARN_ON_USE_H) $(ARG_NONNULL_H)
+strings.h: strings.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) $(ARG_NONNULL_H)
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
diff --git a/modules/strndup b/modules/strndup
index 80f143bee5..c76e966a57 100644
--- a/modules/strndup
+++ b/modules/strndup
@@ -6,9 +6,9 @@ lib/strndup.c
m4/strndup.m4
Depends-on:
-extensions
string
-strnlen
+extensions
+strnlen [test $ac_cv_func_strndup = no || test $REPLACE_STRNDUP = 1]
configure.ac:
gl_FUNC_STRNDUP
diff --git a/modules/strnlen b/modules/strnlen
index 9f9f2ca22f..97fdd667f1 100644
--- a/modules/strnlen
+++ b/modules/strnlen
@@ -6,9 +6,9 @@ lib/strnlen.c
m4/strnlen.m4
Depends-on:
-extensions
string
-memchr
+extensions
+memchr-obsolete [test $HAVE_DECL_STRNLEN = 0 || test $REPLACE_STRNLEN = 1]
configure.ac:
gl_FUNC_STRNLEN
diff --git a/modules/strptime b/modules/strptime
index 667d55245c..763dca5031 100644
--- a/modules/strptime
+++ b/modules/strptime
@@ -7,13 +7,13 @@ m4/strptime.m4
m4/tm_gmtoff.m4
Depends-on:
-extensions
-sys_time
-string
-strcase
-stdbool
time
-time_r
+extensions
+sys_time [test $HAVE_STRPTIME = 0]
+string [test $HAVE_STRPTIME = 0]
+strcase [test $HAVE_STRPTIME = 0]
+stdbool [test $HAVE_STRPTIME = 0]
+time_r [test $HAVE_STRPTIME = 0]
configure.ac:
gl_FUNC_STRPTIME
diff --git a/modules/strsep b/modules/strsep
index 10ca817a82..eaa30329de 100644
--- a/modules/strsep
+++ b/modules/strsep
@@ -6,9 +6,9 @@ lib/strsep.c
m4/strsep.m4
Depends-on:
-extensions
string
-strpbrk
+extensions
+strpbrk [test $HAVE_STRSEP = 0]
configure.ac:
gl_FUNC_STRSEP
diff --git a/modules/strsignal b/modules/strsignal
index 41dda4ec1b..c8e3bfab74 100644
--- a/modules/strsignal
+++ b/modules/strsignal
@@ -8,12 +8,12 @@ m4/strsignal.m4
Depends-on:
string
-gettext-h
-lock
-tls
-snprintf
-memset
extensions
+gettext-h [test $ac_cv_func_strsignal = no || test $REPLACE_STRSIGNAL = 1]
+lock [test $ac_cv_func_strsignal = no || test $REPLACE_STRSIGNAL = 1]
+tls [test $ac_cv_func_strsignal = no || test $REPLACE_STRSIGNAL = 1]
+snprintf [test $ac_cv_func_strsignal = no || test $REPLACE_STRSIGNAL = 1]
+memset [test $ac_cv_func_strsignal = no || test $REPLACE_STRSIGNAL = 1]
configure.ac:
gl_FUNC_STRSIGNAL
diff --git a/modules/strstr-simple b/modules/strstr-simple
index 9ebf5dac89..5f66b279c2 100644
--- a/modules/strstr-simple
+++ b/modules/strstr-simple
@@ -8,9 +8,9 @@ m4/strstr.m4
Depends-on:
string
-stdbool
-memchr
-memcmp
+stdbool [test $REPLACE_STRSTR = 1]
+memchr [test $REPLACE_STRSTR = 1]
+memcmp [test $REPLACE_STRSTR = 1]
configure.ac:
gl_FUNC_STRSTR_SIMPLE
diff --git a/modules/strtod b/modules/strtod
index 056ff4263d..4c2151962a 100644
--- a/modules/strtod
+++ b/modules/strtod
@@ -7,9 +7,10 @@ m4/strtod.m4
m4/ldexp.m4
Depends-on:
-c-ctype
-stdbool
stdlib
+strtod-obsolete
+c-ctype [test $HAVE_STRTOD = 0 || test $REPLACE_STRTOD = 1]
+stdbool [test $HAVE_STRTOD = 0 || test $REPLACE_STRTOD = 1]
configure.ac:
gl_FUNC_STRTOD
diff --git a/modules/strtod-obsolete b/modules/strtod-obsolete
new file mode 100644
index 0000000000..323df8aac1
--- /dev/null
+++ b/modules/strtod-obsolete
@@ -0,0 +1,28 @@
+Description:
+strtod() function for old platforms.
+
+Status:
+obsolete
+
+Notice:
+This module is obsolete.
+
+Files:
+m4/strtod-obsolete.m4
+
+Depends-on:
+strtod
+
+configure.ac:
+gl_FUNC_STRTOD_OBSOLETE
+
+Makefile.am:
+
+Include:
+<string.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+Bruno Haible
diff --git a/modules/strtoimax b/modules/strtoimax
index 9f82af4536..5c8d5e3790 100644
--- a/modules/strtoimax
+++ b/modules/strtoimax
@@ -7,10 +7,10 @@ m4/longlong.m4
m4/strtoimax.m4
Depends-on:
-strtoll
-verify
-inttypes
-stdint
+inttypes-incomplete
+verify [test "$ac_cv_have_decl_strtoimax" != yes && test $ac_cv_func_strtoimax = no]
+stdint [test "$ac_cv_have_decl_strtoimax" != yes && test $ac_cv_func_strtoimax = no]
+strtoll [test "$ac_cv_have_decl_strtoimax" != yes && test $ac_cv_func_strtoimax = no && test $ac_cv_type_long_long_int = yes]
configure.ac:
gl_FUNC_STRTOIMAX
@@ -22,7 +22,7 @@ Include:
<inttypes.h>
License:
-GPL
+LGPL
Maintainer:
Paul Eggert
diff --git a/modules/strtok_r b/modules/strtok_r
index 08afb439e3..bbfef2b68f 100644
--- a/modules/strtok_r
+++ b/modules/strtok_r
@@ -7,7 +7,7 @@ m4/strtok_r.m4
Depends-on:
string
-strpbrk
+strpbrk [test $ac_cv_func_strtok_r = no]
configure.ac:
gl_FUNC_STRTOK_R
diff --git a/modules/strtol b/modules/strtol
index 8a313a4029..654b2f77f3 100644
--- a/modules/strtol
+++ b/modules/strtol
@@ -1,12 +1,17 @@
Description:
strtol() function: convert string to 'long'.
+Status:
+obsolete
+
+Notice:
+This module is obsolete.
+
Files:
lib/strtol.c
m4/strtol.m4
Depends-on:
-wchar
configure.ac:
gl_FUNC_STRTOL
@@ -21,4 +26,3 @@ LGPL
Maintainer:
glibc
-
diff --git a/modules/strtoll b/modules/strtoll
index 738c9efe05..8295e83c2a 100644
--- a/modules/strtoll
+++ b/modules/strtoll
@@ -2,13 +2,13 @@ Description:
strtoll() function: convert string to 'long long'.
Files:
+lib/strtol.c
lib/strtoll.c
m4/longlong.m4
m4/strtoll.m4
Depends-on:
stdlib
-strtol
configure.ac:
gl_FUNC_STRTOLL
@@ -24,4 +24,3 @@ LGPL
Maintainer:
glibc
-
diff --git a/modules/strtoul b/modules/strtoul
index 8cb6d66c48..dc2b50b12f 100644
--- a/modules/strtoul
+++ b/modules/strtoul
@@ -1,12 +1,18 @@
Description:
strtoul() function: convert string to 'unsigned long'.
+Status:
+obsolete
+
+Notice:
+This module is obsolete.
+
Files:
+lib/strtol.c
lib/strtoul.c
m4/strtoul.m4
Depends-on:
-strtol
configure.ac:
gl_FUNC_STRTOUL
@@ -21,4 +27,3 @@ LGPL
Maintainer:
glibc
-
diff --git a/modules/strtoull b/modules/strtoull
index f02e9b0f53..97ce1fd850 100644
--- a/modules/strtoull
+++ b/modules/strtoull
@@ -2,13 +2,14 @@ Description:
strtoull() function: convert string to 'unsigned long long'.
Files:
+lib/strtol.c
+lib/strtoul.c
lib/strtoull.c
m4/longlong.m4
m4/strtoull.m4
Depends-on:
stdlib
-strtoul
configure.ac:
gl_FUNC_STRTOULL
@@ -24,4 +25,3 @@ LGPL
Maintainer:
glibc
-
diff --git a/modules/strtoumax b/modules/strtoumax
index e88628526f..7ad6846913 100644
--- a/modules/strtoumax
+++ b/modules/strtoumax
@@ -2,15 +2,16 @@ Description:
strtoumax() function: convert string to 'uintmax_t'.
Files:
+lib/strtoimax.c
lib/strtoumax.c
m4/longlong.m4
m4/strtoumax.m4
Depends-on:
-strtoimax
-strtoull
-inttypes
-stdint
+inttypes-incomplete
+verify [test "$ac_cv_have_decl_strtoumax" != yes && test $ac_cv_func_strtoumax = no]
+stdint [test "$ac_cv_have_decl_strtoumax" != yes && test $ac_cv_func_strtoumax = no]
+strtoull [test "$ac_cv_have_decl_strtoumax" != yes && test $ac_cv_func_strtoumax = no && test $ac_cv_type_unsigned_long_long_int = yes]
configure.ac:
gl_FUNC_STRTOUMAX
@@ -22,7 +23,7 @@ Include:
<inttypes.h>
License:
-GPL
+LGPL
Maintainer:
Paul Eggert
diff --git a/modules/symlink b/modules/symlink
index 313a6a0d28..729f01cbeb 100644
--- a/modules/symlink
+++ b/modules/symlink
@@ -6,8 +6,8 @@ lib/symlink.c
m4/symlink.m4
Depends-on:
-lstat
unistd
+lstat [test $HAVE_SYMLINK = 0 || test $REPLACE_SYMLINK = 1]
configure.ac:
gl_FUNC_SYMLINK
diff --git a/modules/symlinkat b/modules/symlinkat
index 16646be699..f2666afff2 100644
--- a/modules/symlinkat
+++ b/modules/symlinkat
@@ -6,11 +6,11 @@ lib/symlinkat.c
m4/symlinkat.m4
Depends-on:
+unistd
extensions
fcntl-h
-openat
-symlink
-unistd
+openat [test $HAVE_SYMLINKAT = 0]
+symlink [test $HAVE_SYMLINKAT = 0]
configure.ac:
gl_FUNC_SYMLINKAT
diff --git a/modules/symlinkat-tests b/modules/symlinkat-tests
index 90331494a4..13ae9bd8a1 100644
--- a/modules/symlinkat-tests
+++ b/modules/symlinkat-tests
@@ -12,4 +12,3 @@ configure.ac:
Makefile.am:
TESTS += test-symlinkat
check_PROGRAMS += test-symlinkat
-test_symlinkat_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/sys_file b/modules/sys_file
index 27d87ec9f4..64c3d4d3f0 100644
--- a/modules/sys_file
+++ b/modules/sys_file
@@ -20,7 +20,7 @@ BUILT_SOURCES += sys/file.h
# We need the following in order to create <sys/file.h> when the system
# has one that is incomplete.
-sys/file.h: sys_file.in.h $(WARN_ON_USE_H)
+sys/file.h: sys_file.in.h $(top_builddir)/config.status $(WARN_ON_USE_H)
$(AM_V_at)$(MKDIR_P) sys
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
diff --git a/modules/sys_ioctl b/modules/sys_ioctl
index f5051be2e0..1f8fb86028 100644
--- a/modules/sys_ioctl
+++ b/modules/sys_ioctl
@@ -22,7 +22,7 @@ BUILT_SOURCES += sys/ioctl.h
# We need the following in order to create <sys/ioctl.h> when the system
# does not have a complete one.
-sys/ioctl.h: sys_ioctl.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
+sys/ioctl.h: sys_ioctl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
$(AM_V_at)$(MKDIR_P) sys
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
diff --git a/modules/sys_select b/modules/sys_select
index 9c24a6d639..a70d317a9b 100644
--- a/modules/sys_select
+++ b/modules/sys_select
@@ -23,7 +23,7 @@ BUILT_SOURCES += sys/select.h
# We need the following in order to create <sys/select.h> when the system
# doesn't have one that works with the given compiler.
-sys/select.h: sys_select.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
+sys/select.h: sys_select.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
$(AM_V_at)$(MKDIR_P) sys
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
diff --git a/modules/sys_socket b/modules/sys_socket
index 66c3164487..9d05fd4773 100644
--- a/modules/sys_socket
+++ b/modules/sys_socket
@@ -13,6 +13,7 @@ c++defs
errno
include_next
socklen
+sys_uio
warn-on-use
configure.ac:
@@ -26,7 +27,7 @@ BUILT_SOURCES += sys/socket.h
# We need the following in order to create <sys/socket.h> when the system
# doesn't have one that works with the given compiler.
-sys/socket.h: sys_socket.in.h $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H)
+sys/socket.h: sys_socket.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H)
$(AM_V_at)$(MKDIR_P) sys
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
diff --git a/modules/sys_stat b/modules/sys_stat
index ba70116eac..ac7110a0d7 100644
--- a/modules/sys_stat
+++ b/modules/sys_stat
@@ -24,7 +24,7 @@ BUILT_SOURCES += sys/stat.h
# We need the following in order to create <sys/stat.h> when the system
# has one that is incomplete.
-sys/stat.h: sys_stat.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_at)$(MKDIR_P) sys
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
diff --git a/modules/sys_time b/modules/sys_time
index f4dfa19b90..26c55207e3 100644
--- a/modules/sys_time
+++ b/modules/sys_time
@@ -22,7 +22,7 @@ BUILT_SOURCES += sys/time.h
# We need the following in order to create <sys/time.h> when the system
# doesn't have one that works with the given compiler.
-sys/time.h: sys_time.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+sys/time.h: sys_time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_at)$(MKDIR_P) sys
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
diff --git a/modules/sys_times b/modules/sys_times
index 2ce8e73e2f..febba0f293 100644
--- a/modules/sys_times
+++ b/modules/sys_times
@@ -21,7 +21,7 @@ BUILT_SOURCES += sys/times.h
# We need the following in order to create <sys/times.h> when the system
# doesn't have one that works with the given compiler.
-sys/times.h: sys_times.in.h $(WARN_ON_USE_H) $(ARG_NONNULL_H)
+sys/times.h: sys_times.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) $(ARG_NONNULL_H)
$(AM_V_at)$(MKDIR_P) sys
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
diff --git a/modules/sys_uio b/modules/sys_uio
new file mode 100644
index 0000000000..2152718cca
--- /dev/null
+++ b/modules/sys_uio
@@ -0,0 +1,42 @@
+Description:
+A POSIX-like <sys/uio.h>.
+
+Files:
+lib/sys_uio.in.h
+m4/sys_uio_h.m4
+
+Depends-on:
+include_next
+
+configure.ac:
+gl_HEADER_SYS_UIO
+AC_PROG_MKDIR_P
+
+Makefile.am:
+BUILT_SOURCES += sys/uio.h
+
+# We need the following in order to create <sys/uio.h> when the system
+# doesn't have one that works with the given compiler.
+sys/uio.h: sys_uio.in.h $(top_builddir)/config.status
+ $(AM_V_at)$(MKDIR_P) sys
+ $(AM_V_GEN)rm -f $@-t $@ && \
+ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+ -e 's|@''NEXT_SYS_UIO_H''@|$(NEXT_SYS_UIO_H)|g' \
+ -e 's|@''HAVE_SYS_UIO_H''@|$(HAVE_SYS_UIO_H)|g' \
+ < $(srcdir)/sys_uio.in.h; \
+ } > $@-t && \
+ mv -f $@-t $@
+MOSTLYCLEANFILES += sys/uio.h sys/uio.h-t
+MOSTLYCLEANDIRS += sys
+
+Include:
+<sys/uio.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+Eric Blake
diff --git a/modules/sys_uio-tests b/modules/sys_uio-tests
new file mode 100644
index 0000000000..0258579530
--- /dev/null
+++ b/modules/sys_uio-tests
@@ -0,0 +1,10 @@
+Files:
+tests/test-sys_uio.c
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-sys_uio
+check_PROGRAMS += test-sys_uio
diff --git a/modules/sys_utsname b/modules/sys_utsname
index ff60b4ed5f..87f9bec588 100644
--- a/modules/sys_utsname
+++ b/modules/sys_utsname
@@ -21,7 +21,7 @@ BUILT_SOURCES += sys/utsname.h
# We need the following in order to create <sys/utsname.h> when the system
# does not have one.
-sys/utsname.h: sys_utsname.in.h $(WARN_ON_USE_H) $(ARG_NONNULL_H)
+sys/utsname.h: sys_utsname.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) $(ARG_NONNULL_H)
$(AM_V_at)$(MKDIR_P) sys
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
diff --git a/modules/sys_wait b/modules/sys_wait
index ad42623fe7..654f7217c5 100644
--- a/modules/sys_wait
+++ b/modules/sys_wait
@@ -21,7 +21,7 @@ BUILT_SOURCES += sys/wait.h
# We need the following in order to create <sys/wait.h> when the system
# has one that is incomplete.
-sys/wait.h: sys_wait.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
+sys/wait.h: sys_wait.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
$(AM_V_at)$(MKDIR_P) sys
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
diff --git a/modules/sysexits b/modules/sysexits
index 191ba60ca9..5b1111e096 100644
--- a/modules/sysexits
+++ b/modules/sysexits
@@ -7,6 +7,7 @@ m4/sysexits.m4
Depends-on:
include_next
+stdlib
configure.ac:
gl_SYSEXITS
@@ -19,7 +20,8 @@ BUILT_SOURCES += $(SYSEXITS_H)
# We need the following in order to create <sysexits.h> when the system
# doesn't have one that works with the given compiler.
-sysexits.h: sysexits.in.h
+if GL_GENERATE_SYSEXITS_H
+sysexits.h: sysexits.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''HAVE_SYSEXITS_H''@|$(HAVE_SYSEXITS_H)|g' \
@@ -30,6 +32,10 @@ sysexits.h: sysexits.in.h
< $(srcdir)/sysexits.in.h; \
} > $@-t && \
mv -f $@-t $@
+else
+sysexits.h: $(top_builddir)/config.status
+ rm -f $@
+endif
MOSTLYCLEANFILES += sysexits.h sysexits.h-t
Include:
diff --git a/modules/tanl b/modules/tanl
index b00fd1bd51..7840dc18b9 100644
--- a/modules/tanl
+++ b/modules/tanl
@@ -10,10 +10,10 @@ m4/tanl.m4
Depends-on:
math
extensions
-float
-isnanl
-floor
-floorl
+float [test $HAVE_TANL = 0]
+isnanl [test $HAVE_TANL = 0]
+floor [test $HAVE_TANL = 0]
+floorl [test $HAVE_TANL = 0]
configure.ac:
gl_FUNC_TANL
@@ -28,7 +28,7 @@ Link:
$(TANL_LIBM)
License:
-GPL
+LGPL
Maintainer:
Paolo Bonzini
diff --git a/modules/tcgetsid b/modules/tcgetsid
index 1b72c8d43a..6dddb6eb33 100644
--- a/modules/tcgetsid
+++ b/modules/tcgetsid
@@ -9,7 +9,7 @@ m4/tcgetsid.m4
Depends-on:
termios
extensions
-sys_ioctl
+sys_ioctl [test $ac_cv_func_tcgetsid = no]
configure.ac:
gl_FUNC_TCGETSID
diff --git a/modules/termios b/modules/termios
index 6af1195a3d..71fd548dd1 100644
--- a/modules/termios
+++ b/modules/termios
@@ -20,7 +20,7 @@ BUILT_SOURCES += termios.h
# We need the following in order to create <termios.h> when the system
# version does not have all declarations.
-termios.h: termios.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
+termios.h: termios.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
diff --git a/modules/time b/modules/time
index 8cbe99dffd..140f6dd4b8 100644
--- a/modules/time
+++ b/modules/time
@@ -23,7 +23,7 @@ BUILT_SOURCES += time.h
# We need the following in order to create <time.h> when the system
# doesn't have one that works with the given compiler.
-time.h: time.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
diff --git a/modules/tmpfile b/modules/tmpfile
index 0fa61e8e3c..6adf22a9de 100644
--- a/modules/tmpfile
+++ b/modules/tmpfile
@@ -7,9 +7,9 @@ m4/tmpfile.m4
Depends-on:
stdio
-pathmax
-tempname
-tmpdir
+pathmax [test $REPLACE_TMPFILE = 1]
+tempname [test $REPLACE_TMPFILE = 1]
+tmpdir [test $REPLACE_TMPFILE = 1]
configure.ac:
gl_FUNC_TMPFILE
@@ -21,7 +21,7 @@ Include:
<stdio.h>
License:
-GPL
+LGPL
Maintainer:
Ben Pfaff
diff --git a/modules/trunc b/modules/trunc
index 1c6f706276..71863a54a6 100644
--- a/modules/trunc
+++ b/modules/trunc
@@ -8,7 +8,7 @@ m4/trunc.m4
Depends-on:
math
extensions
-float
+float [test $HAVE_DECL_TRUNC = 0 || test $REPLACE_TRUNC = 1]
configure.ac:
gl_FUNC_TRUNC
diff --git a/modules/truncf b/modules/truncf
index 6c4c46f12a..15e35e8acf 100644
--- a/modules/truncf
+++ b/modules/truncf
@@ -9,7 +9,7 @@ m4/truncf.m4
Depends-on:
math
extensions
-float
+float [test $HAVE_DECL_TRUNCF = 0 || test $REPLACE_TRUNCF = 1]
configure.ac:
gl_FUNC_TRUNCF
diff --git a/modules/truncl b/modules/truncl
index d3d88847ae..808c63ed84 100644
--- a/modules/truncl
+++ b/modules/truncl
@@ -9,7 +9,7 @@ m4/truncl.m4
Depends-on:
math
extensions
-float
+float [test $HAVE_DECL_TRUNCL = 0 || test $REPLACE_TRUNCL = 1]
configure.ac:
gl_FUNC_TRUNCL
diff --git a/modules/tzset b/modules/tzset
index 54f13e3801..608f7756d7 100644
--- a/modules/tzset
+++ b/modules/tzset
@@ -16,7 +16,7 @@ Include:
<time.h>
License:
-GPL
+LGPL
Maintainer:
Jim Meyering
diff --git a/modules/uname b/modules/uname
index ac5ad88fa7..e7364ad3c3 100644
--- a/modules/uname
+++ b/modules/uname
@@ -7,7 +7,7 @@ m4/uname.m4
Depends-on:
sys_utsname
-gethostname
+gethostname [test $HAVE_UNAME = 0]
configure.ac:
gl_FUNC_UNAME
diff --git a/modules/unistd b/modules/unistd
index c30513305f..f750cecf4f 100644
--- a/modules/unistd
+++ b/modules/unistd
@@ -22,7 +22,7 @@ BUILT_SOURCES += unistd.h
# We need the following in order to create an empty placeholder for
# <unistd.h> when the system doesn't have one.
-unistd.h: unistd.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \
@@ -58,6 +58,7 @@ unistd.h: unistd.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
-e 's|@''GNULIB_PIPE2''@|$(GNULIB_PIPE2)|g' \
-e 's|@''GNULIB_PREAD''@|$(GNULIB_PREAD)|g' \
-e 's|@''GNULIB_PWRITE''@|$(GNULIB_PWRITE)|g' \
+ -e 's|@''GNULIB_READ''@|$(GNULIB_READ)|g' \
-e 's|@''GNULIB_READLINK''@|$(GNULIB_READLINK)|g' \
-e 's|@''GNULIB_READLINKAT''@|$(GNULIB_READLINKAT)|g' \
-e 's|@''GNULIB_RMDIR''@|$(GNULIB_RMDIR)|g' \
@@ -66,6 +67,7 @@ unistd.h: unistd.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
-e 's|@''GNULIB_SYMLINKAT''@|$(GNULIB_SYMLINKAT)|g' \
-e 's|@''GNULIB_TTYNAME_R''@|$(GNULIB_TTYNAME_R)|g' \
-e 's|@''GNULIB_UNISTD_H_GETOPT''@|$(GNULIB_UNISTD_H_GETOPT)|g' \
+ -e 's|@''GNULIB_UNISTD_H_NONBLOCKING''@|$(GNULIB_UNISTD_H_NONBLOCKING)|g' \
-e 's|@''GNULIB_UNISTD_H_SIGPIPE''@|$(GNULIB_UNISTD_H_SIGPIPE)|g' \
-e 's|@''GNULIB_UNLINK''@|$(GNULIB_UNLINK)|g' \
-e 's|@''GNULIB_UNLINKAT''@|$(GNULIB_UNLINKAT)|g' \
@@ -126,6 +128,7 @@ unistd.h: unistd.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
-e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \
-e 's|@''REPLACE_PREAD''@|$(REPLACE_PREAD)|g' \
-e 's|@''REPLACE_PWRITE''@|$(REPLACE_PWRITE)|g' \
+ -e 's|@''REPLACE_READ''@|$(REPLACE_READ)|g' \
-e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \
-e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \
-e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \
diff --git a/modules/unlink b/modules/unlink
index a27a308dce..26af43ddcc 100644
--- a/modules/unlink
+++ b/modules/unlink
@@ -6,9 +6,9 @@ lib/unlink.c
m4/unlink.m4
Depends-on:
-dosname
-lstat
unistd
+dosname [test $REPLACE_UNLINK = 1]
+lstat [test $REPLACE_UNLINK = 1]
configure.ac:
gl_FUNC_UNLINK
diff --git a/modules/unlockpt b/modules/unlockpt
index 4eadff8521..3a5c7b86fd 100644
--- a/modules/unlockpt
+++ b/modules/unlockpt
@@ -9,7 +9,7 @@ m4/unlockpt.m4
Depends-on:
stdlib
extensions
-ptsname
+ptsname [test $HAVE_UNLOCKPT = 0]
configure.ac:
gl_FUNC_UNLOCKPT
diff --git a/modules/unsetenv b/modules/unsetenv
index 6dff883c71..26662b349b 100644
--- a/modules/unsetenv
+++ b/modules/unsetenv
@@ -7,8 +7,8 @@ m4/setenv.m4
Depends-on:
stdlib
-unistd
-environ
+unistd [test $ac_cv_func_unsetenv = no || test $REPLACE_UNSETENV = 1]
+environ [test $ac_cv_func_unsetenv = no || test $REPLACE_UNSETENV = 1]
configure.ac:
gl_FUNC_UNSETENV
diff --git a/modules/usleep b/modules/usleep
index c77826bbd7..0bee1cc8b0 100644
--- a/modules/usleep
+++ b/modules/usleep
@@ -6,9 +6,9 @@ lib/usleep.c
m4/usleep.m4
Depends-on:
-extensions
-sleep
unistd
+extensions
+sleep [test $HAVE_USLEEP = 0 || test $REPLACE_USLEEP = 1]
configure.ac:
gl_FUNC_USLEEP
diff --git a/modules/utimecmp b/modules/utimecmp
index 7be906b219..a3160c8d54 100644
--- a/modules/utimecmp
+++ b/modules/utimecmp
@@ -11,7 +11,6 @@ hash
stat-time
time
utimens
-xalloc
intprops
lstat
stdbool
diff --git a/modules/utimensat b/modules/utimensat
index 2377080999..858fee18b7 100644
--- a/modules/utimensat
+++ b/modules/utimensat
@@ -6,10 +6,10 @@ lib/utimensat.c
m4/utimensat.m4
Depends-on:
-openat
sys_stat
-utimens
extensions
+openat [test $HAVE_UTIMENSAT = 0 || test $REPLACE_UTIMENSAT = 1]
+utimens [test $HAVE_UTIMENSAT = 0 || test $REPLACE_UTIMENSAT = 1]
configure.ac:
gl_FUNC_UTIMENSAT
diff --git a/modules/utimensat-tests b/modules/utimensat-tests
index 26dbac6762..987a86abc5 100644
--- a/modules/utimensat-tests
+++ b/modules/utimensat-tests
@@ -19,4 +19,4 @@ configure.ac:
Makefile.am:
TESTS += test-utimensat
check_PROGRAMS += test-utimensat
-test_utimensat_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) @LIBINTL@
+test_utimensat_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
diff --git a/modules/vasprintf b/modules/vasprintf
index e0eed16b24..0b8e1419aa 100644
--- a/modules/vasprintf
+++ b/modules/vasprintf
@@ -12,10 +12,10 @@ lib/asprintf.c
m4/vasprintf.m4
Depends-on:
-extensions
-vasnprintf
stdio
-errno
+extensions
+vasnprintf [test $HAVE_VASPRINTF = 0 || test $REPLACE_VASPRINTF = 1]
+errno [test $HAVE_VASPRINTF = 0 || test $REPLACE_VASPRINTF = 1]
configure.ac:
gl_FUNC_VASPRINTF
diff --git a/modules/vdprintf b/modules/vdprintf
index 3ddda20d13..eba447167c 100644
--- a/modules/vdprintf
+++ b/modules/vdprintf
@@ -7,9 +7,9 @@ m4/vdprintf.m4
Depends-on:
stdio
-vasnprintf
-full-write
-errno
+vasnprintf [test $ac_cv_func_vdprintf = no || test $REPLACE_VDPRINTF = 1]
+full-write [test $ac_cv_func_vdprintf = no || test $REPLACE_VDPRINTF = 1]
+errno [test $ac_cv_func_vdprintf = no || test $REPLACE_VDPRINTF = 1]
configure.ac:
gl_FUNC_VDPRINTF
diff --git a/modules/vdprintf-posix b/modules/vdprintf-posix
index 649eacfce4..518ecde526 100644
--- a/modules/vdprintf-posix
+++ b/modules/vdprintf-posix
@@ -14,18 +14,18 @@ m4/printf.m4
Depends-on:
vdprintf
-vasnprintf
-isnand-nolibm
-isnanl-nolibm
-frexp-nolibm
-frexpl-nolibm
-printf-frexp
-printf-frexpl
-signbit
-fpucw
nocrash
printf-safe
multiarch
+vasnprintf [test $ac_cv_func_vdprintf = no || test $REPLACE_VDPRINTF = 1]
+isnand-nolibm [test $ac_cv_func_vdprintf = no || test $REPLACE_VDPRINTF = 1]
+isnanl-nolibm [test $ac_cv_func_vdprintf = no || test $REPLACE_VDPRINTF = 1]
+frexp-nolibm [test $ac_cv_func_vdprintf = no || test $REPLACE_VDPRINTF = 1]
+frexpl-nolibm [test $ac_cv_func_vdprintf = no || test $REPLACE_VDPRINTF = 1]
+printf-frexp [test $ac_cv_func_vdprintf = no || test $REPLACE_VDPRINTF = 1]
+printf-frexpl [test $ac_cv_func_vdprintf = no || test $REPLACE_VDPRINTF = 1]
+signbit [test $ac_cv_func_vdprintf = no || test $REPLACE_VDPRINTF = 1]
+fpucw [test $ac_cv_func_vdprintf = no || test $REPLACE_VDPRINTF = 1]
configure.ac:
gl_FUNC_VDPRINTF_POSIX
diff --git a/modules/vfprintf-posix b/modules/vfprintf-posix
index 45af3638f5..69b6608e09 100644
--- a/modules/vfprintf-posix
+++ b/modules/vfprintf-posix
@@ -14,20 +14,20 @@ m4/printf.m4
Depends-on:
stdio
-fseterr
-vasnprintf
-isnand-nolibm
-isnanl-nolibm
-frexp-nolibm
-frexpl-nolibm
-printf-frexp
-printf-frexpl
-signbit
-fpucw
nocrash
printf-safe
-errno
multiarch
+fseterr [test $REPLACE_VFPRINTF = 1]
+vasnprintf [test $REPLACE_VFPRINTF = 1]
+isnand-nolibm [test $REPLACE_VFPRINTF = 1]
+isnanl-nolibm [test $REPLACE_VFPRINTF = 1]
+frexp-nolibm [test $REPLACE_VFPRINTF = 1]
+frexpl-nolibm [test $REPLACE_VFPRINTF = 1]
+printf-frexp [test $REPLACE_VFPRINTF = 1]
+printf-frexpl [test $REPLACE_VFPRINTF = 1]
+signbit [test $REPLACE_VFPRINTF = 1]
+fpucw [test $REPLACE_VFPRINTF = 1]
+errno [test $REPLACE_VFPRINTF = 1]
configure.ac:
gl_FUNC_VFPRINTF_POSIX
diff --git a/modules/vfscanf b/modules/vfscanf
new file mode 100644
index 0000000000..c2d6a8d35d
--- /dev/null
+++ b/modules/vfscanf
@@ -0,0 +1,21 @@
+Description:
+vfscanf() function: parse formatted text from a stream
+
+Files:
+
+Depends-on:
+stdio
+
+configure.ac:
+gl_STDIO_MODULE_INDICATOR([vfscanf])
+
+Makefile.am:
+
+Include:
+<stdio.h>
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible
diff --git a/modules/vprintf-posix b/modules/vprintf-posix
index 319d83d6bc..b861d10552 100644
--- a/modules/vprintf-posix
+++ b/modules/vprintf-posix
@@ -14,8 +14,8 @@ m4/printf.m4
Depends-on:
stdio
-vfprintf-posix
printf-safe
+vfprintf-posix [test $REPLACE_VPRINTF = 1]
configure.ac:
gl_FUNC_VPRINTF_POSIX
diff --git a/modules/vscanf b/modules/vscanf
new file mode 100644
index 0000000000..cf1d8c2405
--- /dev/null
+++ b/modules/vscanf
@@ -0,0 +1,21 @@
+Description:
+vscanf() function: parse formatted text from standard input
+
+Files:
+
+Depends-on:
+stdio
+
+configure.ac:
+gl_STDIO_MODULE_INDICATOR([vscanf])
+
+Makefile.am:
+
+Include:
+<stdio.h>
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible
diff --git a/modules/vsnprintf b/modules/vsnprintf
index ce44cf1536..053b10c32a 100644
--- a/modules/vsnprintf
+++ b/modules/vsnprintf
@@ -9,8 +9,8 @@ m4/printf.m4
Depends-on:
stdio
-vasnprintf
-errno
+vasnprintf [test $ac_cv_func_vsnprintf = no || test $REPLACE_VSNPRINTF = 1]
+errno [test $ac_cv_func_vsnprintf = no || test $REPLACE_VSNPRINTF = 1]
configure.ac:
gl_FUNC_VSNPRINTF
diff --git a/modules/vsnprintf-posix b/modules/vsnprintf-posix
index 0f36cd9909..198beeb58a 100644
--- a/modules/vsnprintf-posix
+++ b/modules/vsnprintf-posix
@@ -14,18 +14,18 @@ m4/printf.m4
Depends-on:
vsnprintf
-vasnprintf
-isnand-nolibm
-isnanl-nolibm
-frexp-nolibm
-frexpl-nolibm
-printf-frexp
-printf-frexpl
-signbit
-fpucw
nocrash
printf-safe
multiarch
+vasnprintf [test $ac_cv_func_vsnprintf = no || test $REPLACE_VSNPRINTF = 1]
+isnand-nolibm [test $ac_cv_func_vsnprintf = no || test $REPLACE_VSNPRINTF = 1]
+isnanl-nolibm [test $ac_cv_func_vsnprintf = no || test $REPLACE_VSNPRINTF = 1]
+frexp-nolibm [test $ac_cv_func_vsnprintf = no || test $REPLACE_VSNPRINTF = 1]
+frexpl-nolibm [test $ac_cv_func_vsnprintf = no || test $REPLACE_VSNPRINTF = 1]
+printf-frexp [test $ac_cv_func_vsnprintf = no || test $REPLACE_VSNPRINTF = 1]
+printf-frexpl [test $ac_cv_func_vsnprintf = no || test $REPLACE_VSNPRINTF = 1]
+signbit [test $ac_cv_func_vsnprintf = no || test $REPLACE_VSNPRINTF = 1]
+fpucw [test $ac_cv_func_vsnprintf = no || test $REPLACE_VSNPRINTF = 1]
configure.ac:
gl_FUNC_VSNPRINTF_POSIX
diff --git a/modules/vsprintf-posix b/modules/vsprintf-posix
index 44d89f5407..10e5385612 100644
--- a/modules/vsprintf-posix
+++ b/modules/vsprintf-posix
@@ -14,20 +14,20 @@ m4/printf.m4
Depends-on:
stdio
-vasnprintf
-isnand-nolibm
-isnanl-nolibm
-frexp-nolibm
-frexpl-nolibm
-printf-frexp
-printf-frexpl
-signbit
-fpucw
nocrash
printf-safe
-stdint
-errno
multiarch
+vasnprintf [test $REPLACE_VSPRINTF = 1]
+isnand-nolibm [test $REPLACE_VSPRINTF = 1]
+isnanl-nolibm [test $REPLACE_VSPRINTF = 1]
+frexp-nolibm [test $REPLACE_VSPRINTF = 1]
+frexpl-nolibm [test $REPLACE_VSPRINTF = 1]
+printf-frexp [test $REPLACE_VSPRINTF = 1]
+printf-frexpl [test $REPLACE_VSPRINTF = 1]
+signbit [test $REPLACE_VSPRINTF = 1]
+fpucw [test $REPLACE_VSPRINTF = 1]
+stdint [test $REPLACE_VSPRINTF = 1]
+errno [test $REPLACE_VSPRINTF = 1]
configure.ac:
gl_FUNC_VSPRINTF_POSIX
diff --git a/modules/wait-process b/modules/wait-process
index 9120bbcf0a..afc8854220 100644
--- a/modules/wait-process
+++ b/modules/wait-process
@@ -10,10 +10,10 @@ m4/sig_atomic_t.m4
Depends-on:
fatal-signal
error
-exit
xalloc
gettext-h
stdbool
+stdlib
sys_wait
unistd
atexit
diff --git a/modules/wchar b/modules/wchar
index 154fb81131..5af5cb7dee 100644
--- a/modules/wchar
+++ b/modules/wchar
@@ -23,7 +23,7 @@ BUILT_SOURCES += wchar.h
# We need the following in order to create <wchar.h> when the system
# version does not work standalone.
-wchar.h: wchar.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
diff --git a/modules/wcrtomb b/modules/wcrtomb
index cdafa555ac..f9fea15ff1 100644
--- a/modules/wcrtomb
+++ b/modules/wcrtomb
@@ -12,9 +12,9 @@ m4/locale-zh.m4
m4/codeset.m4
Depends-on:
-extensions
wchar
-mbsinit
+extensions
+mbsinit [test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1]
configure.ac:
gl_FUNC_WCRTOMB
diff --git a/modules/wcscasecmp b/modules/wcscasecmp
index 18c549c2f6..4639354bf5 100644
--- a/modules/wcscasecmp
+++ b/modules/wcscasecmp
@@ -8,7 +8,7 @@ m4/wcscasecmp.m4
Depends-on:
wchar
-wctype-h
+wctype-h [test $HAVE_WCSCASECMP = 0]
configure.ac:
gl_FUNC_WCSCASECMP
diff --git a/modules/wcscspn b/modules/wcscspn
index 2034b81b17..14b9a24e85 100644
--- a/modules/wcscspn
+++ b/modules/wcscspn
@@ -14,8 +14,8 @@ m4/wcscspn.m4
Depends-on:
wchar
-wcslen
-wcschr
+wcslen [test $HAVE_WCSCSPN = 0]
+wcschr [test $HAVE_WCSCSPN = 0]
configure.ac:
gl_FUNC_WCSCSPN
diff --git a/modules/wcsdup b/modules/wcsdup
index 7e3cd66172..49a512e607 100644
--- a/modules/wcsdup
+++ b/modules/wcsdup
@@ -8,8 +8,8 @@ m4/wcsdup.m4
Depends-on:
wchar
-wcslen
-wmemcpy
+wcslen [test $HAVE_WCSDUP = 0]
+wmemcpy [test $HAVE_WCSDUP = 0]
configure.ac:
gl_FUNC_WCSDUP
diff --git a/modules/wcsncasecmp b/modules/wcsncasecmp
index 88f36198da..3a1f84a1cd 100644
--- a/modules/wcsncasecmp
+++ b/modules/wcsncasecmp
@@ -8,7 +8,7 @@ m4/wcsncasecmp.m4
Depends-on:
wchar
-wctype-h
+wctype-h [test $HAVE_WCSNCASECMP = 0]
configure.ac:
gl_FUNC_WCSNCASECMP
diff --git a/modules/wcsnrtombs b/modules/wcsnrtombs
index e8e975a73f..3582ae57fc 100644
--- a/modules/wcsnrtombs
+++ b/modules/wcsnrtombs
@@ -13,9 +13,9 @@ m4/locale-zh.m4
m4/codeset.m4
Depends-on:
-extensions
wchar
-wcrtomb
+extensions
+wcrtomb [test $HAVE_WCSNRTOMBS = 0 || test $REPLACE_WCSNRTOMBS = 1]
configure.ac:
gl_FUNC_WCSNRTOMBS
diff --git a/modules/wcspbrk b/modules/wcspbrk
index a5b34f538b..b7aefa47c4 100644
--- a/modules/wcspbrk
+++ b/modules/wcspbrk
@@ -14,7 +14,7 @@ m4/wcspbrk.m4
Depends-on:
wchar
-wcschr
+wcschr [test $HAVE_WCSPBRK = 0]
configure.ac:
gl_FUNC_WCSPBRK
diff --git a/modules/wcsrtombs b/modules/wcsrtombs
index 235b06b043..49c0503953 100644
--- a/modules/wcsrtombs
+++ b/modules/wcsrtombs
@@ -14,9 +14,9 @@ m4/locale-zh.m4
m4/codeset.m4
Depends-on:
-extensions
wchar
-wcrtomb
+extensions
+wcrtomb [test $HAVE_WCSRTOMBS = 0 || test $REPLACE_WCSRTOMBS = 1]
configure.ac:
gl_FUNC_WCSRTOMBS
diff --git a/modules/wcsspn b/modules/wcsspn
index 3ecd53b979..035398d9bc 100644
--- a/modules/wcsspn
+++ b/modules/wcsspn
@@ -14,7 +14,7 @@ m4/wcsspn.m4
Depends-on:
wchar
-wcschr
+wcschr [test $HAVE_WCSSPN = 0]
configure.ac:
gl_FUNC_WCSSPN
diff --git a/modules/wcsstr b/modules/wcsstr
index 22a2fb763c..d4f22f8509 100644
--- a/modules/wcsstr
+++ b/modules/wcsstr
@@ -8,7 +8,7 @@ m4/wcsstr.m4
Depends-on:
wchar
-wcschr
+wcschr [test $HAVE_WCSSTR = 0]
configure.ac:
gl_FUNC_WCSSTR
diff --git a/modules/wcstok b/modules/wcstok
index 6f92b050b9..dc78e135bc 100644
--- a/modules/wcstok
+++ b/modules/wcstok
@@ -8,8 +8,8 @@ m4/wcstok.m4
Depends-on:
wchar
-wcsspn
-wcspbrk
+wcsspn [test $HAVE_WCSTOK = 0]
+wcspbrk [test $HAVE_WCSTOK = 0]
configure.ac:
gl_FUNC_WCSTOK
diff --git a/modules/wcswidth b/modules/wcswidth
index 2b748eb7a6..629f21db80 100644
--- a/modules/wcswidth
+++ b/modules/wcswidth
@@ -9,7 +9,7 @@ m4/wcswidth.m4
Depends-on:
wchar
-wcwidth
+wcwidth [test $HAVE_WCSWIDTH = 0 || test $REPLACE_WCSWIDTH = 1]
configure.ac:
gl_FUNC_WCSWIDTH
diff --git a/modules/wctob b/modules/wctob
index eba2ebf293..be430ebf41 100644
--- a/modules/wctob
+++ b/modules/wctob
@@ -9,7 +9,7 @@ m4/codeset.m4
Depends-on:
wchar
-wctomb
+wctomb [test $ac_cv_func_wctob = no || test $REPLACE_WCTOB = 1]
configure.ac:
gl_FUNC_WCTOB
diff --git a/modules/wctomb b/modules/wctomb
index 81d41c4b90..5077005487 100644
--- a/modules/wctomb
+++ b/modules/wctomb
@@ -8,8 +8,8 @@ m4/wctomb.m4
Depends-on:
stdlib
-wcrtomb
-wchar
+wcrtomb [test $REPLACE_WCTOMB = 1]
+wchar [test $REPLACE_WCTOMB = 1]
configure.ac:
gl_FUNC_WCTOMB
diff --git a/modules/wctype b/modules/wctype
index d2481640a1..ffc76a863e 100644
--- a/modules/wctype
+++ b/modules/wctype
@@ -14,7 +14,7 @@ m4/wctype.m4
Depends-on:
wctype-h
-iswblank
+iswblank [test $HAVE_WCTYPE_T = 0]
configure.ac:
gl_FUNC_WCTYPE
diff --git a/modules/wctype-h b/modules/wctype-h
index f0d7989fd5..30c5ceaeed 100644
--- a/modules/wctype-h
+++ b/modules/wctype-h
@@ -19,7 +19,7 @@ BUILT_SOURCES += wctype.h
# We need the following in order to create <wctype.h> when the system
# doesn't have one that works with the given compiler.
-wctype.h: wctype.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
+wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
diff --git a/modules/wcwidth b/modules/wcwidth
index e4a9460e94..27327a15c9 100644
--- a/modules/wcwidth
+++ b/modules/wcwidth
@@ -8,12 +8,12 @@ m4/wchar_t.m4
m4/wint_t.m4
Depends-on:
-extensions
wchar
-wctype-h
-localcharset
-streq
-uniwidth/width
+extensions
+wctype-h [test $ac_cv_func_wcwidth != yes || test $REPLACE_WCWIDTH = 1]
+localcharset [test $ac_cv_func_wcwidth != yes || test $REPLACE_WCWIDTH = 1]
+streq [test $ac_cv_func_wcwidth != yes || test $REPLACE_WCWIDTH = 1]
+uniwidth/width [test $ac_cv_func_wcwidth != yes || test $REPLACE_WCWIDTH = 1]
configure.ac:
gl_FUNC_WCWIDTH
diff --git a/modules/write b/modules/write
index 0f0fc5f234..736e40b091 100644
--- a/modules/write
+++ b/modules/write
@@ -7,7 +7,7 @@ m4/write.m4
Depends-on:
unistd
-raise
+raise [test $REPLACE_WRITE = 1]
configure.ac:
gl_FUNC_WRITE
diff --git a/modules/xalloc b/modules/xalloc
index 43ee94205c..0edcfc6eac 100644
--- a/modules/xalloc
+++ b/modules/xalloc
@@ -9,6 +9,7 @@ m4/xalloc.m4
Depends-on:
inline
xalloc-die
+xalloc-oversized
configure.ac:
gl_XALLOC
diff --git a/modules/xalloc-oversized b/modules/xalloc-oversized
new file mode 100644
index 0000000000..708c621f30
--- /dev/null
+++ b/modules/xalloc-oversized
@@ -0,0 +1,20 @@
+Description:
+Check for memory allocation overflow. Also see xalloc.
+
+Files:
+lib/xalloc-oversized.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+
+Include:
+"xalloc-oversized.h"
+
+License:
+GPL
+
+Maintainer:
+all
diff --git a/modules/xgetgroups b/modules/xgetgroups
new file mode 100644
index 0000000000..6ae3614342
--- /dev/null
+++ b/modules/xgetgroups
@@ -0,0 +1,25 @@
+Description:
+Return the group IDs of a user or current process in malloc'd storage, with
+out-of-memory checking.
+
+Files:
+lib/xgetgroups.c
+
+Depends-on:
+mgetgroups
+xalloc
+
+configure.ac:
+gl_MODULE_INDICATOR([xgetgroups])
+
+Makefile.am:
+lib_SOURCES += xgetgroups.c
+
+Include:
+"mgetgroups.h"
+
+License:
+GPL
+
+Maintainer:
+Jim Meyering, Eric Blake
diff --git a/modules/xsetenv b/modules/xsetenv
index 29319f1223..66c1c4c373 100644
--- a/modules/xsetenv
+++ b/modules/xsetenv
@@ -10,8 +10,8 @@ Depends-on:
setenv
unsetenv
error
-exit
gettext-h
+stdlib
configure.ac:
diff --git a/modules/xstrtol b/modules/xstrtol
index 3ce76a8802..b48a4bb1b6 100644
--- a/modules/xstrtol
+++ b/modules/xstrtol
@@ -14,7 +14,7 @@ error
getopt-gnu
gettext-h
intprops
-inttypes
+inttypes-incomplete
configure.ac:
gl_XSTRTOL