Use the GL_CFLAG_GNULIB_WARNINGS for most AC_LIBOBJ compilation units.

* modules/_Exit (configure.ac): Define an Automake conditional. Remove
the AC_LIBOBJ invocation.
(Makefile.am): Augment lib_SOURCES, guarded by that Automake
conditional.
* modules/accept: Likewise.
* modules/access: Likewise.
* modules/acosf: Likewise.
* modules/acosl: Likewise.
* modules/aligned_alloc: Likewise.
* modules/alphasort: Likewise.
* modules/argz: Likewise.
* modules/asinf: Likewise.
* modules/asinl: Likewise.
* modules/atan2f: Likewise.
* modules/atanf: Likewise.
* modules/atanl: Likewise.
* modules/atexit: Likewise.
* modules/atoll: Likewise.
* modules/bind: Likewise.
* modules/btowc: Likewise.
* modules/c32rtomb: Likewise.
* modules/canonicalize-lgpl: Likewise.
* modules/cbrt: Likewise.
* modules/cbrtf: Likewise.
* modules/cbrtl: Likewise.
* modules/ceil: Likewise.
* modules/ceilf: Likewise.
* modules/ceill: Likewise.
* modules/chdir-long: Likewise.
* modules/chown: Likewise.
* modules/close: Likewise.
* modules/closedir: Likewise.
* modules/cnd: Likewise.
* modules/connect: Likewise.
* modules/copy-file-range: Likewise.
* modules/copysign: Likewise.
* modules/copysignf: Likewise.
* modules/copysignl: Likewise.
* modules/cosf: Likewise.
* modules/coshf: Likewise.
* modules/cosl: Likewise.
* modules/creat: Likewise.
* modules/crypto/gc: Likewise.
* modules/ctime: Likewise.
* modules/dirfd: Likewise.
* modules/dup: Likewise.
* modules/dup2: Likewise.
* modules/duplocale: Likewise.
* modules/error: Likewise.
* modules/euidaccess: Likewise.
* modules/execinfo: Likewise.
* modules/execl: Likewise.
* modules/execle: Likewise.
* modules/execlp: Likewise.
* modules/execv: Likewise.
* modules/execve: Likewise.
* modules/execvp: Likewise.
* modules/execvpe: Likewise.
* modules/exp2: Likewise.
* modules/exp2f: Likewise.
* modules/exp2l: Likewise.
* modules/expf: Likewise.
* modules/expl: Likewise.
* modules/explicit_bzero: Likewise.
* modules/expm1: Likewise.
* modules/expm1f: Likewise.
* modules/expm1l: Likewise.
* modules/fabsf: Likewise.
* modules/fabsl: Likewise.
* modules/faccessat: Likewise.
* modules/fchdir: Likewise.
* modules/fchmodat: Likewise.
* modules/fchownat: Likewise.
* modules/fclose: Likewise.
* modules/fcntl: Likewise.
* modules/fdatasync: Likewise.
* modules/fdopen: Likewise.
* modules/fdopendir: Likewise.
* modules/fflush: Likewise.
* modules/ffs: Likewise.
* modules/ffsl: Likewise.
* modules/ffsll: Likewise.
* modules/fileblocks: Likewise.
* modules/float: Likewise.
* modules/flock: Likewise.
* modules/floor: Likewise.
* modules/floorf: Likewise.
* modules/floorl: Likewise.
* modules/fma: Likewise.
* modules/fmaf: Likewise.
* modules/fmal: Likewise.
* modules/fmod: Likewise.
* modules/fmodf: Likewise.
* modules/fmodl: Likewise.
* modules/forkpty: Likewise.
* modules/fpending: Likewise.
* modules/fpurge: Likewise.
* modules/freadable: Likewise.
* modules/freadahead: Likewise.
* modules/freadptr: Likewise.
* modules/free-posix: Likewise.
* modules/freopen: Likewise.
* modules/frexpf: Likewise.
* modules/fseek: Likewise.
* modules/fseeko: Likewise.
* modules/fseterr: Likewise.
* modules/fstat: Likewise.
* modules/fstatat: Likewise.
* modules/fsusage: Likewise.
* modules/fsync: Likewise.
* modules/ftell: Likewise.
* modules/ftello: Likewise.
* modules/ftruncate: Likewise.
* modules/fts: Likewise.
* modules/futimens: Likewise.
* modules/fwritable: Likewise.
* modules/fwriting: Likewise.
* modules/getaddrinfo: Likewise.
* modules/getcwd: Likewise.
* modules/getcwd-lgpl: Likewise.
* modules/getdelim: Likewise.
* modules/getdomainname: Likewise.
* modules/getdtablesize: Likewise.
* modules/getentropy: Likewise.
* modules/getgroups: Likewise.
* modules/gethostname: Likewise.
* modules/getline: Likewise.
* modules/getloadavg: Likewise.
* modules/getlogin: Likewise.
* modules/getlogin_r: Likewise.
* modules/getopt-posix: Likewise.
* modules/getpagesize: Likewise.
* modules/getpeername: Likewise.
* modules/getrandom: Likewise.
* modules/getrusage: Likewise.
* modules/getsockname: Likewise.
* modules/getsockopt: Likewise.
* modules/getsubopt: Likewise.
* modules/gettimeofday: Likewise.
* modules/getumask: Likewise.
* modules/getusershell: Likewise.
* modules/glob: Likewise.
* modules/grantpt: Likewise.
* modules/group-member: Likewise.
* modules/hypot: Likewise.
* modules/hypotf: Likewise.
* modules/hypotl: Likewise.
* modules/iconv_open: Likewise.
* modules/ilogb: Likewise.
* modules/ilogbf: Likewise.
* modules/ilogbl: Likewise.
* modules/imaxabs: Likewise.
* modules/imaxdiv: Likewise.
* modules/inet_ntop: Likewise.
* modules/inet_pton: Likewise.
* modules/ioctl: Likewise.
* modules/isapipe: Likewise.
* modules/isatty: Likewise.
* modules/isblank: Likewise.
* modules/isfinite: Likewise.
* modules/isinf: Likewise.
* modules/iswblank: Likewise.
* modules/iswctype: Likewise.
* modules/iswdigit: Likewise.
* modules/iswxdigit: Likewise.
* modules/lchmod: Likewise.
* modules/lchown: Likewise.
* modules/ldexpf: Likewise.
* modules/ldexpl: Likewise.
* modules/libgmp: Likewise.
* modules/link: Likewise.
* modules/linkat: Likewise.
* modules/listen: Likewise.
* modules/localeconv: Likewise.
* modules/localtime: Likewise.
* modules/log: Likewise.
* modules/log10: Likewise.
* modules/log10f: Likewise.
* modules/log10l: Likewise.
* modules/log1p: Likewise.
* modules/log1pf: Likewise.
* modules/log1pl: Likewise.
* modules/log2: Likewise.
* modules/log2f: Likewise.
* modules/log2l: Likewise.
* modules/logb: Likewise.
* modules/logbf: Likewise.
* modules/logbl: Likewise.
* modules/logf: Likewise.
* modules/login_tty: Likewise.
* modules/logl: Likewise.
* modules/lseek: Likewise.
* modules/lstat: Likewise.
* modules/mbrlen: Likewise.
* modules/mbrtoc32: Likewise.
* modules/mbrtowc: Likewise.
* modules/mbsinit: Likewise.
* modules/mbsnrtowcs: Likewise.
* modules/mbsrtowcs: Likewise.
* modules/mbtowc: Likewise.
* modules/memalign: Likewise.
* modules/memchr: Likewise.
* modules/memcmp: Likewise.
* modules/memcpy: Likewise.
* modules/memmove: Likewise.
* modules/mempcpy: Likewise.
* modules/memrchr: Likewise.
* modules/memset: Likewise.
* modules/mkdir: Likewise.
* modules/mkdirat: Likewise.
* modules/mkdtemp: Likewise.
* modules/mkfifo: Likewise.
* modules/mkfifoat: Likewise.
* modules/mknod: Likewise.
* modules/mkostemp: Likewise.
* modules/mkostemps: Likewise.
* modules/mkstemp: Likewise.
* modules/mkstemps: Likewise.
* modules/modf: Likewise.
* modules/modff: Likewise.
* modules/modfl: Likewise.
* modules/mountlist: Likewise.
* modules/msvc-inval: Likewise.
* modules/msvc-nothrow: Likewise.
* modules/mtx: Likewise.
* modules/nanosleep: Likewise.
* modules/nl_langinfo: Likewise.
* modules/obstack: Likewise.
* modules/open: Likewise.
* modules/openat: Likewise.
* modules/opendir: Likewise.
* modules/openpty: Likewise.
* modules/pclose: Likewise.
* modules/perror: Likewise.
* modules/pipe-posix: Likewise.
* modules/poll: Likewise.
* modules/popen: Likewise.
* modules/posix_memalign: Likewise.
* modules/posix_openpt: Likewise.
* modules/posix_spawn: Likewise.
* modules/posix_spawn-internal: Likewise.
* modules/posix_spawn_file_actions_addchdir: Likewise.
* modules/posix_spawn_file_actions_addclose: Likewise.
* modules/posix_spawn_file_actions_adddup2: Likewise.
* modules/posix_spawn_file_actions_addfchdir: Likewise.
* modules/posix_spawn_file_actions_addopen: Likewise.
* modules/posix_spawn_file_actions_destroy: Likewise.
* modules/posix_spawn_file_actions_init: Likewise.
* modules/posix_spawnattr_destroy: Likewise.
* modules/posix_spawnattr_getflags: Likewise.
* modules/posix_spawnattr_getpgroup: Likewise.
* modules/posix_spawnattr_getschedparam: Likewise.
* modules/posix_spawnattr_getschedpolicy: Likewise.
* modules/posix_spawnattr_getsigdefault: Likewise.
* modules/posix_spawnattr_getsigmask: Likewise.
* modules/posix_spawnattr_init: Likewise.
* modules/posix_spawnattr_setflags: Likewise.
* modules/posix_spawnattr_setpgroup: Likewise.
* modules/posix_spawnattr_setschedparam: Likewise.
* modules/posix_spawnattr_setschedpolicy: Likewise.
* modules/posix_spawnattr_setsigdefault: Likewise.
* modules/posix_spawnattr_setsigmask: Likewise.
* modules/posix_spawnp: Likewise.
* modules/powf: Likewise.
* modules/pread: Likewise.
* modules/pselect: Likewise.
* modules/pthread-cond: Likewise.
* modules/pthread-mutex: Likewise.
* modules/pthread-once: Likewise.
* modules/pthread-rwlock: Likewise.
* modules/pthread-spin: Likewise.
* modules/pthread-thread: Likewise.
* modules/pthread-tss: Likewise.
* modules/pthread_mutex_timedlock: Likewise.
* modules/pthread_sigmask: Likewise.
* modules/ptsname: Likewise.
* modules/ptsname_r: Likewise.
* modules/putenv: Likewise.
* modules/pwrite: Likewise.
* modules/qsort_r: Likewise.
* modules/raise: Likewise.
* modules/random: Likewise.
* modules/random_r: Likewise.
* modules/rawmemchr: Likewise.
* modules/read: Likewise.
* modules/readdir: Likewise.
* modules/readline: Likewise.
* modules/readlink: Likewise.
* modules/readlinkat: Likewise.
* modules/readutmp: Likewise.
* modules/reallocarray: Likewise.
* modules/recv: Likewise.
* modules/recvfrom: Likewise.
* modules/regex: Likewise.
* modules/relocatable-prog: Likewise.
* modules/remainder: Likewise.
* modules/remainderf: Likewise.
* modules/remainderl: Likewise.
* modules/remove: Likewise.
* modules/rename: Likewise.
* modules/renameat: Likewise.
* modules/rewinddir: Likewise.
* modules/rint: Likewise.
* modules/rintf: Likewise.
* modules/rintl: Likewise.
* modules/rmdir: Likewise.
* modules/round: Likewise.
* modules/roundf: Likewise.
* modules/roundl: Likewise.
* modules/rpmatch: Likewise.
* modules/scandir: Likewise.
* modules/sched_yield: Likewise.
* modules/secure_getenv: Likewise.
* modules/select: Likewise.
* modules/selinux-h: Likewise.
* modules/send: Likewise.
* modules/sendto: Likewise.
* modules/setenv: Likewise.
* modules/sethostname: Likewise.
* modules/setlocale: Likewise.
* modules/setlocale-null: Likewise.
* modules/setsockopt: Likewise.
* modules/shutdown: Likewise.
* modules/sig2str: Likewise.
* modules/sigabbrev_np: Likewise.
* modules/sigaction: Likewise.
* modules/sigdescr_np: Likewise.
* modules/signbit: Likewise.
* modules/sigprocmask: Likewise.
* modules/sinf: Likewise.
* modules/sinhf: Likewise.
* modules/sinl: Likewise.
* modules/sleep: Likewise.
* modules/socket: Likewise.
* modules/spawn-pipe: Likewise.
* modules/sqrtf: Likewise.
* modules/sqrtl: Likewise.
* modules/stat: Likewise.
* modules/stdio: Likewise.
* modules/stpcpy: Likewise.
* modules/stpncpy: Likewise.
* modules/strcase: Likewise.
* modules/strchrnul: Likewise.
* modules/strcspn: Likewise.
* modules/strdup-posix: Likewise.
* modules/strerror: Likewise.
* modules/strerror-override: Likewise.
* modules/strerrorname_np: Likewise.
* modules/strfmon_l: Likewise.
* modules/strftime-fixes: Likewise.
* modules/strncat: Likewise.
* modules/strndup: Likewise.
* modules/strnlen: Likewise.
* modules/strpbrk: Likewise.
* modules/strptime: Likewise.
* modules/strsep: Likewise.
* modules/strsignal: Likewise.
* modules/strtod: Likewise.
* modules/strtoimax: Likewise.
* modules/strtok_r: Likewise.
* modules/strtol: Likewise.
* modules/strtold: Likewise.
* modules/strtoll: Likewise.
* modules/strtoul: Likewise.
* modules/strtoull: Likewise.
* modules/strtoumax: Likewise.
* modules/strverscmp: Likewise.
* modules/symlink: Likewise.
* modules/symlinkat: Likewise.
* modules/tanf: Likewise.
* modules/tanhf: Likewise.
* modules/tanl: Likewise.
* modules/tcgetsid: Likewise.
* modules/thrd: Likewise.
* modules/time_r: Likewise.
* modules/time_rz: Likewise.
* modules/timegm: Likewise.
* modules/times: Likewise.
* modules/timespec_get: Likewise.
* modules/timespec_getres: Likewise.
* modules/tmpfile: Likewise.
* modules/towctrans: Likewise.
* modules/trunc: Likewise.
* modules/truncate: Likewise.
* modules/truncf: Likewise.
* modules/truncl: Likewise.
* modules/tsearch: Likewise.
* modules/tss: Likewise.
* modules/ttyname_r: Likewise.
* modules/tzset: Likewise.
* modules/uname: Likewise.
* modules/unlink: Likewise.
* modules/unlinkat: Likewise.
* modules/unlockpt: Likewise.
* modules/unsetenv: Likewise.
* modules/usleep: Likewise.
* modules/utime: Likewise.
* modules/utimensat: Likewise.
* modules/waitpid: Likewise.
* modules/wcpcpy: Likewise.
* modules/wcpncpy: Likewise.
* modules/wcrtomb: Likewise.
* modules/wcscasecmp: Likewise.
* modules/wcscat: Likewise.
* modules/wcschr: Likewise.
* modules/wcscmp: Likewise.
* modules/wcscoll: Likewise.
* modules/wcscpy: Likewise.
* modules/wcscspn: Likewise.
* modules/wcsdup: Likewise.
* modules/wcsftime: Likewise.
* modules/wcslen: Likewise.
* modules/wcsncasecmp: Likewise.
* modules/wcsncat: Likewise.
* modules/wcsncmp: Likewise.
* modules/wcsncpy: Likewise.
* modules/wcsnlen: Likewise.
* modules/wcsnrtombs: Likewise.
* modules/wcspbrk: Likewise.
* modules/wcsrchr: Likewise.
* modules/wcsrtombs: Likewise.
* modules/wcsspn: Likewise.
* modules/wcsstr: Likewise.
* modules/wcstok: Likewise.
* modules/wcswidth: Likewise.
* modules/wcsxfrm: Likewise.
* modules/wctob: Likewise.
* modules/wctomb: Likewise.
* modules/wctrans: Likewise.
* modules/wctype: Likewise.
* modules/wcwidth: Likewise.
* modules/windows-cond: Likewise.
* modules/windows-mutex: Likewise.
* modules/windows-once: Likewise.
* modules/windows-recmutex: Likewise.
* modules/windows-rwlock: Likewise.
* modules/windows-spawn: Likewise.
* modules/windows-spin: Likewise.
* modules/windows-thread: Likewise.
* modules/windows-timedmutex: Likewise.
* modules/windows-timedrecmutex: Likewise.
* modules/windows-timedrwlock: Likewise.
* modules/windows-tls: Likewise.
* modules/wmemchr: Likewise.
* modules/wmemcmp: Likewise.
* modules/wmemcpy: Likewise.
* modules/wmemmove: Likewise.
* modules/wmempcpy: Likewise.
* modules/wmemset: Likewise.
* modules/write: Likewise.

447 files changed, 2364 insertions, 1425 deletions

diff --git a/modules/_Exit b/modules/_Exit
index cefebdccd5..fa4bde0554 100644
--- a/modules/_Exit
+++ b/modules/_Exit
@@ -11,13 +11,16 @@ unistd
 
 configure.ac:
 gl_FUNC__EXIT
-if test $HAVE__EXIT = 0; then
-  AC_LIBOBJ([_Exit])
+gl_CONDITIONAL([GL_COND_OBJ__EXIT], [test $HAVE__EXIT = 0])
+AM_COND_IF([GL_COND_OBJ__EXIT], [
   gl_PREREQ__EXIT
-fi
+])
 gl_STDLIB_MODULE_INDICATOR([_Exit])
 
 Makefile.am:
+if GL_COND_OBJ__EXIT
+lib_SOURCES += _Exit.c
+endif
 
 Include:
 <stdlib.h>
diff --git a/modules/accept b/modules/accept
index d95c8295f7..483b5364ec 100644
--- a/modules/accept
+++ b/modules/accept
@@ -14,12 +14,13 @@ msvc-nothrow    [test "$ac_cv_header_winsock2_h" = yes]
 
 configure.ac:
 AC_REQUIRE([gl_SYS_SOCKET_H])
-if test "$ac_cv_header_winsock2_h" = yes; then
-  AC_LIBOBJ([accept])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_ACCEPT], [test "$ac_cv_header_winsock2_h" = yes])
 gl_SYS_SOCKET_MODULE_INDICATOR([accept])
 
 Makefile.am:
+if GL_COND_OBJ_ACCEPT
+lib_SOURCES += accept.c
+endif
 
 Include:
 <sys/socket.h>
diff --git a/modules/access b/modules/access
index 7434e021ef..cc23d81cae 100644
--- a/modules/access
+++ b/modules/access
@@ -11,12 +11,13 @@ fcntl
 
 configure.ac:
 gl_FUNC_ACCESS
-if test $REPLACE_ACCESS = 1; then
-  AC_LIBOBJ([access])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_ACCESS], [test $REPLACE_ACCESS = 1])
 gl_UNISTD_MODULE_INDICATOR([access])
 
 Makefile.am:
+if GL_COND_OBJ_ACCESS
+lib_SOURCES += access.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/acosf b/modules/acosf
index 647b05ec77..77589dc012 100644
--- a/modules/acosf
+++ b/modules/acosf
@@ -12,12 +12,13 @@ acos            [test $HAVE_ACOSF = 0]
 
 configure.ac:
 gl_FUNC_ACOSF
-if test $HAVE_ACOSF = 0; then
-  AC_LIBOBJ([acosf])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_ACOSF], [test $HAVE_ACOSF = 0])
 gl_MATH_MODULE_INDICATOR([acosf])
 
 Makefile.am:
+if GL_COND_OBJ_ACOSF
+lib_SOURCES += acosf.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/acosl b/modules/acosl
index 2ca9ebe875..5ea80c6fde 100644
--- a/modules/acosl
+++ b/modules/acosl
@@ -14,12 +14,13 @@ sqrtl           [test $HAVE_ACOSL = 0 && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE =
 
 configure.ac:
 gl_FUNC_ACOSL
-if test $HAVE_ACOSL = 0; then
-  AC_LIBOBJ([acosl])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_ACOSL], [test $HAVE_ACOSL = 0])
 gl_MATH_MODULE_INDICATOR([acosl])
 
 Makefile.am:
+if GL_COND_OBJ_ACOSL
+lib_SOURCES += acosl.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/aligned_alloc b/modules/aligned_alloc
index f7757f4a96..e04115ec9e 100644
--- a/modules/aligned_alloc
+++ b/modules/aligned_alloc
@@ -11,12 +11,13 @@ stdlib
 
 configure.ac:
 gl_FUNC_ALIGNED_ALLOC
-if test $REPLACE_ALIGNED_ALLOC = 1; then
-  AC_LIBOBJ([aligned_alloc])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_ALIGNED_ALLOC], [test $REPLACE_ALIGNED_ALLOC = 1])
 gl_STDLIB_MODULE_INDICATOR([aligned_alloc])
 
 Makefile.am:
+if GL_COND_OBJ_ALIGNED_ALLOC
+lib_SOURCES += aligned_alloc.c
+endif
 
 Include:
 <stdlib.h>
diff --git a/modules/alphasort b/modules/alphasort
index e5670571e1..786fcce5e6 100644
--- a/modules/alphasort
+++ b/modules/alphasort
@@ -11,13 +11,16 @@ extensions
 
 configure.ac:
 gl_FUNC_ALPHASORT
-if test $HAVE_ALPHASORT = 0; then
-  AC_LIBOBJ([alphasort])
+gl_CONDITIONAL([GL_COND_OBJ_ALPHASORT], [test $HAVE_ALPHASORT = 0])
+AM_COND_IF([GL_COND_OBJ_ALPHASORT], [
   gl_PREREQ_ALPHASORT
-fi
+])
 gl_DIRENT_MODULE_INDICATOR([alphasort])
 
 Makefile.am:
+if GL_COND_OBJ_ALPHASORT
+lib_SOURCES += alphasort.c
+endif
 
 Include:
 <dirent.h>
diff --git a/modules/argz b/modules/argz
index 058aa65bc3..f936347998 100644
--- a/modules/argz
+++ b/modules/argz
@@ -19,9 +19,7 @@ configure.ac:
 gl_FUNC_ARGZ
 gl_CONDITIONAL_HEADER([argz.h])
 AC_PROG_MKDIR_P
-if test -n "$ARGZ_H"; then
-  AC_LIBOBJ([argz])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_ARGZ], [test -n "$ARGZ_H"])
 
 Makefile.am:
 BUILT_SOURCES += $(ARGZ_H)
@@ -39,6 +37,10 @@ argz.h: $(top_builddir)/config.status
 endif
 MOSTLYCLEANFILES += argz.h argz.h-t
 
+if GL_COND_OBJ_ARGZ
+lib_SOURCES += argz.c
+endif
+
 Include:
 <argz.h>
 
diff --git a/modules/asinf b/modules/asinf
index 13ff1fd018..ed04fbc402 100644
--- a/modules/asinf
+++ b/modules/asinf
@@ -12,12 +12,13 @@ asin            [test $HAVE_ASINF = 0]
 
 configure.ac:
 gl_FUNC_ASINF
-if test $HAVE_ASINF = 0; then
-  AC_LIBOBJ([asinf])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_ASINF], [test $HAVE_ASINF = 0])
 gl_MATH_MODULE_INDICATOR([asinf])
 
 Makefile.am:
+if GL_COND_OBJ_ASINF
+lib_SOURCES += asinf.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/asinl b/modules/asinl
index 8abb65b85a..af0ba38dae 100644
--- a/modules/asinl
+++ b/modules/asinl
@@ -13,12 +13,13 @@ sqrtl           [test $HAVE_ASINL = 0 && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE =
 
 configure.ac:
 gl_FUNC_ASINL
-if test $HAVE_ASINL = 0; then
-  AC_LIBOBJ([asinl])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_ASINL], [test $HAVE_ASINL = 0])
 gl_MATH_MODULE_INDICATOR([asinl])
 
 Makefile.am:
+if GL_COND_OBJ_ASINL
+lib_SOURCES += asinl.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/atan2f b/modules/atan2f
index 96d44071ae..fe1c9b8520 100644
--- a/modules/atan2f
+++ b/modules/atan2f
@@ -12,12 +12,13 @@ atan2           [test $HAVE_ATAN2F = 0]
 
 configure.ac:
 gl_FUNC_ATAN2F
-if test $HAVE_ATAN2F = 0; then
-  AC_LIBOBJ([atan2f])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_ATAN2F], [test $HAVE_ATAN2F = 0])
 gl_MATH_MODULE_INDICATOR([atan2f])
 
 Makefile.am:
+if GL_COND_OBJ_ATAN2F
+lib_SOURCES += atan2f.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/atanf b/modules/atanf
index dda2d74e49..c3caffc134 100644
--- a/modules/atanf
+++ b/modules/atanf
@@ -12,12 +12,13 @@ atan            [test $HAVE_ATANF = 0]
 
 configure.ac:
 gl_FUNC_ATANF
-if test $HAVE_ATANF = 0; then
-  AC_LIBOBJ([atanf])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_ATANF], [test $HAVE_ATANF = 0])
 gl_MATH_MODULE_INDICATOR([atanf])
 
 Makefile.am:
+if GL_COND_OBJ_ATANF
+lib_SOURCES += atanf.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/atanl b/modules/atanl
index a600846a31..b17201a8da 100644
--- a/modules/atanl
+++ b/modules/atanl
@@ -13,12 +13,13 @@ isnanl          [test $HAVE_ATANL = 0 && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE =
 
 configure.ac:
 gl_FUNC_ATANL
-if test $HAVE_ATANL = 0; then
-  AC_LIBOBJ([atanl])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_ATANL], [test $HAVE_ATANL = 0])
 gl_MATH_MODULE_INDICATOR([atanl])
 
 Makefile.am:
+if GL_COND_OBJ_ATANL
+lib_SOURCES += atanl.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/atexit b/modules/atexit
index d01895fa5a..b1ff394320 100644
--- a/modules/atexit
+++ b/modules/atexit
@@ -15,12 +15,15 @@ Depends-on:
 
 configure.ac:
 gl_FUNC_ATEXIT
-if test $ac_cv_func_atexit = no; then
-  AC_LIBOBJ([atexit])
+gl_CONDITIONAL([GL_COND_OBJ_ATEXIT], [test $ac_cv_func_atexit = no])
+AM_COND_IF([GL_COND_OBJ_ATEXIT], [
   gl_PREREQ_ATEXIT
-fi
+])
 
 Makefile.am:
+if GL_COND_OBJ_ATEXIT
+lib_SOURCES += atexit.c
+endif
 
 Include:
 <stdlib.h>
diff --git a/modules/atoll b/modules/atoll
index 69cda85117..ac5fdcb9b9 100644
--- a/modules/atoll
+++ b/modules/atoll
@@ -10,13 +10,16 @@ strtoll         [test $HAVE_ATOLL = 0]
 
 configure.ac:
 gl_FUNC_ATOLL
-if test $HAVE_ATOLL = 0; then
-  AC_LIBOBJ([atoll])
+gl_CONDITIONAL([GL_COND_OBJ_ATOLL], [test $HAVE_ATOLL = 0])
+AM_COND_IF([GL_COND_OBJ_ATOLL], [
   gl_PREREQ_ATOLL
-fi
+])
 gl_STDLIB_MODULE_INDICATOR([atoll])
 
 Makefile.am:
+if GL_COND_OBJ_ATOLL
+lib_SOURCES += atoll.c
+endif
 
 Include:
 <stdlib.h>
diff --git a/modules/bind b/modules/bind
index bd0ef9d649..f58407830e 100644
--- a/modules/bind
+++ b/modules/bind
@@ -13,12 +13,13 @@ msvc-nothrow    [test "$ac_cv_header_winsock2_h" = yes]
 
 configure.ac:
 AC_REQUIRE([gl_SYS_SOCKET_H])
-if test "$ac_cv_header_winsock2_h" = yes; then
-  AC_LIBOBJ([bind])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_BIND], [test "$ac_cv_header_winsock2_h" = yes])
 gl_SYS_SOCKET_MODULE_INDICATOR([bind])
 
 Makefile.am:
+if GL_COND_OBJ_BIND
+lib_SOURCES += bind.c
+endif
 
 Include:
 <sys/socket.h>
diff --git a/modules/btowc b/modules/btowc
index 68f4066cc5..80d786cfa6 100644
--- a/modules/btowc
+++ b/modules/btowc
@@ -12,13 +12,17 @@ mbtowc          [test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1]
 
 configure.ac:
 gl_FUNC_BTOWC
-if test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1; then
-  AC_LIBOBJ([btowc])
+gl_CONDITIONAL([GL_COND_OBJ_BTOWC],
+               [test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1])
+AM_COND_IF([GL_COND_OBJ_BTOWC], [
   gl_PREREQ_BTOWC
-fi
+])
 gl_WCHAR_MODULE_INDICATOR([btowc])
 
 Makefile.am:
+if GL_COND_OBJ_BTOWC
+lib_SOURCES += btowc.c
+endif
 
 Include:
 <wchar.h>
diff --git a/modules/c32rtomb b/modules/c32rtomb
index 9863d70207..a8457721bb 100644
--- a/modules/c32rtomb
+++ b/modules/c32rtomb
@@ -16,12 +16,14 @@ streq           [{ test $HAVE_C32RTOMB = 0 || test $REPLACE_C32RTOMB = 1; } && t
 
 configure.ac:
 gl_FUNC_C32RTOMB
-if test $HAVE_C32RTOMB = 0 || test $REPLACE_C32RTOMB = 1; then
-  AC_LIBOBJ([c32rtomb])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_C32RTOMB],
+               [test $HAVE_C32RTOMB = 0 || test $REPLACE_C32RTOMB = 1])
 gl_UCHAR_MODULE_INDICATOR([c32rtomb])
 
 Makefile.am:
+if GL_COND_OBJ_C32RTOMB
+lib_SOURCES += c32rtomb.c
+endif
 
 Include:
 <uchar.h>
diff --git a/modules/canonicalize-lgpl b/modules/canonicalize-lgpl
index 0bc5591c5b..252618e95e 100644
--- a/modules/canonicalize-lgpl
+++ b/modules/canonicalize-lgpl
@@ -32,14 +32,16 @@ unistd            [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONI
 
 configure.ac:
 gl_CANONICALIZE_LGPL
-if test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1; then
-  AC_LIBOBJ([canonicalize-lgpl])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_CANONICALIZE_LGPL],
+               [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1])
 gl_MODULE_INDICATOR([canonicalize-lgpl])
 gl_STDLIB_MODULE_INDICATOR([canonicalize_file_name])
 gl_STDLIB_MODULE_INDICATOR([realpath])
 
 Makefile.am:
+if GL_COND_OBJ_CANONICALIZE_LGPL
+lib_SOURCES += canonicalize-lgpl.c
+endif
 
 Include:
 <stdlib.h>
diff --git a/modules/cbrt b/modules/cbrt
index 05f61dca3e..f77bd23b8d 100644
--- a/modules/cbrt
+++ b/modules/cbrt
@@ -16,12 +16,13 @@ ldexp           [test $HAVE_CBRT = 0]
 
 configure.ac:
 gl_FUNC_CBRT
-if test $HAVE_CBRT = 0; then
-  AC_LIBOBJ([cbrt])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_CBRT], [test $HAVE_CBRT = 0])
 gl_MATH_MODULE_INDICATOR([cbrt])
 
 Makefile.am:
+if GL_COND_OBJ_CBRT
+lib_SOURCES += cbrt.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/cbrtf b/modules/cbrtf
index d4d44a636c..0a46424adf 100644
--- a/modules/cbrtf
+++ b/modules/cbrtf
@@ -17,12 +17,14 @@ ldexpf          [test $HAVE_CBRTF = 0 || test $REPLACE_CBRTF = 1]
 
 configure.ac:
 gl_FUNC_CBRTF
-if test $HAVE_CBRTF = 0 || test $REPLACE_CBRTF = 1; then
-  AC_LIBOBJ([cbrtf])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_CBRTF],
+               [test $HAVE_CBRTF = 0 || test $REPLACE_CBRTF = 1])
 gl_MATH_MODULE_INDICATOR([cbrtf])
 
 Makefile.am:
+if GL_COND_OBJ_CBRTF
+lib_SOURCES += cbrtf.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/cbrtl b/modules/cbrtl
index cbfdd1f3d5..92755d799c 100644
--- a/modules/cbrtl
+++ b/modules/cbrtl
@@ -17,12 +17,14 @@ ldexpl          [{ test $HAVE_CBRTL = 0 || test $REPLACE_CBRTL = 1; } && test $H
 
 configure.ac:
 gl_FUNC_CBRTL
-if test $HAVE_CBRTL = 0 || test $REPLACE_CBRTL = 1; then
-  AC_LIBOBJ([cbrtl])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_CBRTL],
+               [test $HAVE_CBRTL = 0 || test $REPLACE_CBRTL = 1])
 gl_MATH_MODULE_INDICATOR([cbrtl])
 
 Makefile.am:
+if GL_COND_OBJ_CBRTL
+lib_SOURCES += cbrtl.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/ceil b/modules/ceil
index 98c7a9081a..3d2f5cc475 100644
--- a/modules/ceil
+++ b/modules/ceil
@@ -11,12 +11,13 @@ float           [test $REPLACE_CEIL = 1]
 
 configure.ac:
 gl_FUNC_CEIL
-if test $REPLACE_CEIL = 1; then
-  AC_LIBOBJ([ceil])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_CEIL], [test $REPLACE_CEIL = 1])
 gl_MATH_MODULE_INDICATOR([ceil])
 
 Makefile.am:
+if GL_COND_OBJ_CEIL
+lib_SOURCES += ceil.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/ceilf b/modules/ceilf
index fc04351d0e..57daa28594 100644
--- a/modules/ceilf
+++ b/modules/ceilf
@@ -13,12 +13,14 @@ float           [test $HAVE_DECL_CEILF = 0 || test $REPLACE_CEILF = 1]
 
 configure.ac:
 gl_FUNC_CEILF
-if test $HAVE_DECL_CEILF = 0 || test $REPLACE_CEILF = 1; then
-  AC_LIBOBJ([ceilf])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_CEILF],
+               [test $HAVE_DECL_CEILF = 0 || test $REPLACE_CEILF = 1])
 gl_MATH_MODULE_INDICATOR([ceilf])
 
 Makefile.am:
+if GL_COND_OBJ_CEILF
+lib_SOURCES += ceilf.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/ceill b/modules/ceill
index 49a5e765b9..0f38402e82 100644
--- a/modules/ceill
+++ b/modules/ceill
@@ -14,12 +14,14 @@ float           [{ test $HAVE_DECL_CEILL = 0 || test $REPLACE_CEILL = 1; } && te
 
 configure.ac:
 gl_FUNC_CEILL
-if test $HAVE_DECL_CEILL = 0 || test $REPLACE_CEILL = 1; then
-  AC_LIBOBJ([ceill])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_CEILL],
+               [test $HAVE_DECL_CEILL = 0 || test $REPLACE_CEILL = 1])
 gl_MATH_MODULE_INDICATOR([ceill])
 
 Makefile.am:
+if GL_COND_OBJ_CEILL
+lib_SOURCES += ceill.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/chdir-long b/modules/chdir-long
index 3cab294e67..c08ff622b4 100644
--- a/modules/chdir-long
+++ b/modules/chdir-long
@@ -24,12 +24,16 @@ stdlib          [test $gl_cv_have_unlimited_file_name_length = no]
 
 configure.ac:
 gl_FUNC_CHDIR_LONG
-if test $gl_cv_have_unlimited_file_name_length = no; then
-  AC_LIBOBJ([chdir-long])
+gl_CONDITIONAL([GL_COND_OBJ_CHDIR_LONG],
+               [test $gl_cv_have_unlimited_file_name_length = no])
+AM_COND_IF([GL_COND_OBJ_CHDIR_LONG], [
   gl_PREREQ_CHDIR_LONG
-fi
+])
 
 Makefile.am:
+if GL_COND_OBJ_CHDIR_LONG
+lib_SOURCES += chdir-long.c
+endif
 
 Include:
 "chdir-long.h"
diff --git a/modules/chown b/modules/chown
index 9c7294b0ef..d3f2d1e10e 100644
--- a/modules/chown
+++ b/modules/chown
@@ -16,15 +16,19 @@ sys_stat        [test $HAVE_CHOWN = 0 || test $REPLACE_CHOWN = 1]
 
 configure.ac:
 gl_FUNC_CHOWN
-if test $HAVE_CHOWN = 0 || test $REPLACE_CHOWN = 1; then
-  AC_LIBOBJ([chown])
-fi
-if test $REPLACE_CHOWN = 1 && test $ac_cv_func_fchown = no; then
-  AC_LIBOBJ([fchown-stub])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_CHOWN],
+               [test $HAVE_CHOWN = 0 || test $REPLACE_CHOWN = 1])
+gl_CONDITIONAL([GL_COND_OBJ_FCHOWN_STUB],
+               [test $REPLACE_CHOWN = 1 && test $ac_cv_func_fchown = no])
 gl_UNISTD_MODULE_INDICATOR([chown])
 
 Makefile.am:
+if GL_COND_OBJ_CHOWN
+lib_SOURCES += chown.c
+endif
+if GL_COND_OBJ_FCHOWN_STUB
+lib_SOURCES += fchown-stub.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/close b/modules/close
index 4f27823c4f..926ea85501 100644
--- a/modules/close
+++ b/modules/close
@@ -12,12 +12,13 @@ msvc-inval      [test $REPLACE_CLOSE = 1]
 
 configure.ac:
 gl_FUNC_CLOSE
-if test $REPLACE_CLOSE = 1; then
-  AC_LIBOBJ([close])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_CLOSE], [test $REPLACE_CLOSE = 1])
 gl_UNISTD_MODULE_INDICATOR([close])
 
 Makefile.am:
+if GL_COND_OBJ_CLOSE
+lib_SOURCES += close.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/closedir b/modules/closedir
index cdc0de30fb..9353e11f1c 100644
--- a/modules/closedir
+++ b/modules/closedir
@@ -12,12 +12,14 @@ dirfd           [test $HAVE_CLOSEDIR = 0 || test $REPLACE_CLOSEDIR = 1]
 
 configure.ac:
 gl_FUNC_CLOSEDIR
-if test $HAVE_CLOSEDIR = 0 || test $REPLACE_CLOSEDIR = 1; then
-  AC_LIBOBJ([closedir])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_CLOSEDIR],
+               [test $HAVE_CLOSEDIR = 0 || test $REPLACE_CLOSEDIR = 1])
 gl_DIRENT_MODULE_INDICATOR([closedir])
 
 Makefile.am:
+if GL_COND_OBJ_CLOSEDIR
+lib_SOURCES += closedir.c
+endif
 
 Include:
 <dirent.h>
diff --git a/modules/cnd b/modules/cnd
index 6870479613..cb4ec4a5bd 100644
--- a/modules/cnd
+++ b/modules/cnd
@@ -11,12 +11,13 @@ gettimeofday
 
 configure.ac:
 AC_REQUIRE([gl_THREADS_H])
-if test $HAVE_THREADS_H = 0; then
-  AC_LIBOBJ([cnd])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_CND], [test $HAVE_THREADS_H = 0])
 gl_THREADS_MODULE_INDICATOR([cnd])
 
 Makefile.am:
+if GL_COND_OBJ_CND
+lib_SOURCES += cnd.c
+endif
 
 Include:
 <threads.h>
diff --git a/modules/connect b/modules/connect
index 91e1534c43..cd21697b75 100644
--- a/modules/connect
+++ b/modules/connect
@@ -13,12 +13,13 @@ msvc-nothrow    [test "$ac_cv_header_winsock2_h" = yes]
 
 configure.ac:
 AC_REQUIRE([gl_SYS_SOCKET_H])
-if test "$ac_cv_header_winsock2_h" = yes; then
-  AC_LIBOBJ([connect])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_CONNECT], [test "$ac_cv_header_winsock2_h" = yes])
 gl_SYS_SOCKET_MODULE_INDICATOR([connect])
 
 Makefile.am:
+if GL_COND_OBJ_CONNECT
+lib_SOURCES += connect.c
+endif
 
 Include:
 <sys/socket.h>
diff --git a/modules/copy-file-range b/modules/copy-file-range
index 42d6e6f311..e2a4ffef46 100644
--- a/modules/copy-file-range
+++ b/modules/copy-file-range
@@ -11,12 +11,13 @@ unistd
 
 configure.ac:
 gl_FUNC_COPY_FILE_RANGE
-if test $HAVE_COPY_FILE_RANGE = 0; then
-  AC_LIBOBJ([copy-file-range])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_COPY_FILE_RANGE], [test $HAVE_COPY_FILE_RANGE = 0])
 gl_UNISTD_MODULE_INDICATOR([copy-file-range])
 
 Makefile.am:
+if GL_COND_OBJ_COPY_FILE_RANGE
+lib_SOURCES += copy-file-range.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/copysign b/modules/copysign
index 33ee356e76..6c0a06126d 100644
--- a/modules/copysign
+++ b/modules/copysign
@@ -12,12 +12,13 @@ signbit         [test $HAVE_COPYSIGN = 0]
 
 configure.ac:
 gl_FUNC_COPYSIGN
-if test $HAVE_COPYSIGN = 0; then
-  AC_LIBOBJ([copysign])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_COPYSIGN], [test $HAVE_COPYSIGN = 0])
 gl_MATH_MODULE_INDICATOR([copysign])
 
 Makefile.am:
+if GL_COND_OBJ_COPYSIGN
+lib_SOURCES += copysign.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/copysignf b/modules/copysignf
index d06d8e994e..b30215afed 100644
--- a/modules/copysignf
+++ b/modules/copysignf
@@ -13,12 +13,13 @@ signbit         [test $HAVE_COPYSIGNF = 0]
 
 configure.ac:
 gl_FUNC_COPYSIGNF
-if test $HAVE_COPYSIGNF = 0; then
-  AC_LIBOBJ([copysignf])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_COPYSIGNF], [test $HAVE_COPYSIGNF = 0])
 gl_MATH_MODULE_INDICATOR([copysignf])
 
 Makefile.am:
+if GL_COND_OBJ_COPYSIGNF
+lib_SOURCES += copysignf.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/copysignl b/modules/copysignl
index 02ac52e094..d1c80583d7 100644
--- a/modules/copysignl
+++ b/modules/copysignl
@@ -14,12 +14,13 @@ signbit         [test $HAVE_COPYSIGNL = 0 && test $HAVE_SAME_LONG_DOUBLE_AS_DOUB
 
 configure.ac:
 gl_FUNC_COPYSIGNL
-if test $HAVE_COPYSIGNL = 0; then
-  AC_LIBOBJ([copysignl])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_COPYSIGNL], [test $HAVE_COPYSIGNL = 0])
 gl_MATH_MODULE_INDICATOR([copysignl])
 
 Makefile.am:
+if GL_COND_OBJ_COPYSIGNL
+lib_SOURCES += copysignl.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/cosf b/modules/cosf
index 424ae56b1c..3adf1d6885 100644
--- a/modules/cosf
+++ b/modules/cosf
@@ -12,12 +12,13 @@ cos             [test $HAVE_COSF = 0]
 
 configure.ac:
 gl_FUNC_COSF
-if test $HAVE_COSF = 0; then
-  AC_LIBOBJ([cosf])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_COSF], [test $HAVE_COSF = 0])
 gl_MATH_MODULE_INDICATOR([cosf])
 
 Makefile.am:
+if GL_COND_OBJ_COSF
+lib_SOURCES += cosf.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/coshf b/modules/coshf
index 1eb5b8be5b..8af4caac5e 100644
--- a/modules/coshf
+++ b/modules/coshf
@@ -12,12 +12,13 @@ cosh            [test $HAVE_COSHF = 0]
 
 configure.ac:
 gl_FUNC_COSHF
-if test $HAVE_COSHF = 0; then
-  AC_LIBOBJ([coshf])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_COSHF], [test $HAVE_COSHF = 0])
 gl_MATH_MODULE_INDICATOR([coshf])
 
 Makefile.am:
+if GL_COND_OBJ_COSHF
+lib_SOURCES += coshf.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/cosl b/modules/cosl
index 3b60a4e4b3..4b0499f4a9 100644
--- a/modules/cosl
+++ b/modules/cosl
@@ -19,16 +19,19 @@ floorl          [test $HAVE_COSL = 0 && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE =
 
 configure.ac:
 gl_FUNC_COSL
-if test $HAVE_COSL = 0; then
-  AC_LIBOBJ([cosl])
+gl_CONDITIONAL([GL_COND_OBJ_COSL], [test $HAVE_COSL = 0])
+AM_COND_IF([GL_COND_OBJ_COSL], [
   if test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0; then
     AC_LIBOBJ([sincosl])
     AC_LIBOBJ([trigl])
   fi
-fi
+])
 gl_MATH_MODULE_INDICATOR([cosl])
 
 Makefile.am:
+if GL_COND_OBJ_COSL
+lib_SOURCES += cosl.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/creat b/modules/creat
index d95d6ba457..a246c3fb1e 100644
--- a/modules/creat
+++ b/modules/creat
@@ -12,12 +12,13 @@ largefile
 
 configure.ac:
 gl_FUNC_CREAT
-if test $REPLACE_CREAT = 1; then
-  AC_LIBOBJ([creat])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_CREAT], [test $REPLACE_CREAT = 1])
 gl_FCNTL_MODULE_INDICATOR([creat])
 
 Makefile.am:
+if GL_COND_OBJ_CREAT
+lib_SOURCES += creat.c
+endif
 
 Include:
 <fcntl.h>
diff --git a/modules/crypto/gc b/modules/crypto/gc
index 46ccde1334..cd1d56b5c0 100644
--- a/modules/crypto/gc
+++ b/modules/crypto/gc
@@ -14,17 +14,18 @@ open
 
 configure.ac:
 gl_GC
-if test "$ac_cv_libgcrypt" = yes; then
-  AC_LIBOBJ([gc-libgcrypt])
-else
-  AC_LIBOBJ([gc-gnulib])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_GC_LIBGCRYPT], [test "$ac_cv_libgcrypt" = yes])
 if test $gl_cond_libtool = false; then
   gl_ltlibdeps="$gl_ltlibdeps $LTLIBGCRYPT"
   gl_libdeps="$gl_libdeps $LIBGCRYPT"
 fi
 
 Makefile.am:
+if GL_COND_OBJ_GC_LIBGCRYPT
+lib_SOURCES += gc-libgcrypt.c
+else
+lib_SOURCES += gc-gnulib.c
+endif
 if GL_COND_LIBTOOL
 lib_LDFLAGS += $(LTLIBGCRYPT)
 endif
diff --git a/modules/ctime b/modules/ctime
index d700ca87a6..949f849b91 100644
--- a/modules/ctime
+++ b/modules/ctime
@@ -10,12 +10,13 @@ time
 
 configure.ac:
 gl_FUNC_CTIME
-if test $REPLACE_CTIME = 1; then
-  AC_LIBOBJ([ctime])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_CTIME], [test $REPLACE_CTIME = 1])
 gl_TIME_MODULE_INDICATOR([ctime])
 
 Makefile.am:
+if GL_COND_OBJ_CTIME
+lib_SOURCES += ctime.c
+endif
 
 Include:
 <time.h>
diff --git a/modules/dirfd b/modules/dirfd
index 0ad0bf42c2..0ffcf7ebbd 100644
--- a/modules/dirfd
+++ b/modules/dirfd
@@ -12,14 +12,17 @@ errno           [test $ac_cv_func_dirfd = no && test $gl_cv_func_dirfd_macro = n
 
 configure.ac:
 gl_FUNC_DIRFD
-if test $ac_cv_func_dirfd = no && test $gl_cv_func_dirfd_macro = no \
-   || test $REPLACE_DIRFD = 1; then
-  AC_LIBOBJ([dirfd])
+gl_CONDITIONAL([GL_COND_OBJ_DIRFD],
+               [test $ac_cv_func_dirfd = no && test $gl_cv_func_dirfd_macro = no || test $REPLACE_DIRFD = 1])
+AM_COND_IF([GL_COND_OBJ_DIRFD], [
   gl_PREREQ_DIRFD
-fi
+])
 gl_DIRENT_MODULE_INDICATOR([dirfd])
 
 Makefile.am:
+if GL_COND_OBJ_DIRFD
+lib_SOURCES += dirfd.c
+endif
 
 Include:
 <dirent.h>
diff --git a/modules/dup b/modules/dup
index 46a6c96d30..2f42e07356 100644
--- a/modules/dup
+++ b/modules/dup
@@ -11,13 +11,16 @@ msvc-inval      [test $REPLACE_DUP = 1]
 
 configure.ac:
 gl_FUNC_DUP
-if test $REPLACE_DUP = 1; then
-  AC_LIBOBJ([dup])
+gl_CONDITIONAL([GL_COND_OBJ_DUP], [test $REPLACE_DUP = 1])
+AM_COND_IF([GL_COND_OBJ_DUP], [
   gl_PREREQ_DUP
-fi
+])
 gl_UNISTD_MODULE_INDICATOR([dup])
 
 Makefile.am:
+if GL_COND_OBJ_DUP
+lib_SOURCES += dup.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/dup2 b/modules/dup2
index 70a28ded69..acbc017069 100644
--- a/modules/dup2
+++ b/modules/dup2
@@ -12,13 +12,16 @@ msvc-nothrow    [test $REPLACE_DUP2 = 1]
 
 configure.ac:
 gl_FUNC_DUP2
-if test $REPLACE_DUP2 = 1; then
-  AC_LIBOBJ([dup2])
+gl_CONDITIONAL([GL_COND_OBJ_DUP2], [test $REPLACE_DUP2 = 1])
+AM_COND_IF([GL_COND_OBJ_DUP2], [
   gl_PREREQ_DUP2
-fi
+])
 gl_UNISTD_MODULE_INDICATOR([dup2])
 
 Makefile.am:
+if GL_COND_OBJ_DUP2
+lib_SOURCES += dup2.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/duplocale b/modules/duplocale
index aaa12cd09d..0c6dc22757 100644
--- a/modules/duplocale
+++ b/modules/duplocale
@@ -11,13 +11,16 @@ setlocale-null  [test $REPLACE_DUPLOCALE = 1]
 
 configure.ac:
 gl_FUNC_DUPLOCALE
-if test $REPLACE_DUPLOCALE = 1; then
-  AC_LIBOBJ([duplocale])
+gl_CONDITIONAL([GL_COND_OBJ_DUPLOCALE], [test $REPLACE_DUPLOCALE = 1])
+AM_COND_IF([GL_COND_OBJ_DUPLOCALE], [
   gl_PREREQ_DUPLOCALE
-fi
+])
 gl_LOCALE_MODULE_INDICATOR([duplocale])
 
 Makefile.am:
+if GL_COND_OBJ_DUPLOCALE
+lib_SOURCES += duplocale.c
+endif
 
 Include:
 <locale.h>
diff --git a/modules/error b/modules/error
index 08370da770..e8363528aa 100644
--- a/modules/error
+++ b/modules/error
@@ -15,8 +15,8 @@ msvc-nothrow    [test $ac_cv_lib_error_at_line = no]
 
 configure.ac:
 gl_ERROR
-AS_IF([test "$ac_cv_lib_error_at_line" = no], [
-  AC_LIBOBJ([error])
+gl_CONDITIONAL([GL_COND_OBJ_ERROR], [test "$ac_cv_lib_error_at_line" = no])
+AM_COND_IF([GL_COND_OBJ_ERROR], [
   gl_PREREQ_ERROR
 ])
 m4_ifdef([AM_XGETTEXT_OPTION],
@@ -24,6 +24,9 @@ m4_ifdef([AM_XGETTEXT_OPTION],
    AM_][XGETTEXT_OPTION([--flag=error_at_line:5:c-format])])
 
 Makefile.am:
+if GL_COND_OBJ_ERROR
+lib_SOURCES += error.c
+endif
 
 Include:
 "error.h"
diff --git a/modules/euidaccess b/modules/euidaccess
index 9240338f7b..43b0945199 100644
--- a/modules/euidaccess
+++ b/modules/euidaccess
@@ -16,13 +16,16 @@ sys_stat        [test $HAVE_EUIDACCESS = 0]
 
 configure.ac:
 gl_FUNC_EUIDACCESS
-if test $HAVE_EUIDACCESS = 0; then
-  AC_LIBOBJ([euidaccess])
+gl_CONDITIONAL([GL_COND_OBJ_EUIDACCESS], [test $HAVE_EUIDACCESS = 0])
+AM_COND_IF([GL_COND_OBJ_EUIDACCESS], [
   gl_PREREQ_EUIDACCESS
-fi
+])
 gl_UNISTD_MODULE_INDICATOR([euidaccess])
 
 Makefile.am:
+if GL_COND_OBJ_EUIDACCESS
+lib_SOURCES += euidaccess.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/execinfo b/modules/execinfo
index 4ac772ba49..f93593e261 100644
--- a/modules/execinfo
+++ b/modules/execinfo
@@ -14,9 +14,7 @@ configure.ac:
 gl_EXECINFO_H
 gl_CONDITIONAL_HEADER([execinfo.h])
 AC_PROG_MKDIR_P
-if $GL_GENERATE_EXECINFO_H; then
-  AC_LIBOBJ([execinfo])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_EXECINFO], [$GL_GENERATE_EXECINFO_H])
 
 Makefile.am:
 BUILT_SOURCES += $(EXECINFO_H)
@@ -34,6 +32,10 @@ execinfo.h: $(top_builddir)/config.status
 endif
 MOSTLYCLEANFILES += execinfo.h execinfo.h-t
 
+if GL_COND_OBJ_EXECINFO
+lib_SOURCES += execinfo.c
+endif
+
 Include:
 <execinfo.h>
 
diff --git a/modules/execl b/modules/execl
index 9d64c5c78e..8465221c67 100644
--- a/modules/execl
+++ b/modules/execl
@@ -12,12 +12,13 @@ malloca         [test $REPLACE_EXECL = 1]
 
 configure.ac:
 gl_FUNC_EXECL
-if test $REPLACE_EXECL = 1; then
-  AC_LIBOBJ([execl])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_EXECL], [test $REPLACE_EXECL = 1])
 gl_UNISTD_MODULE_INDICATOR([execl])
 
 Makefile.am:
+if GL_COND_OBJ_EXECL
+lib_SOURCES += execl.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/execle b/modules/execle
index dd3c9ad961..586efa177c 100644
--- a/modules/execle
+++ b/modules/execle
@@ -12,12 +12,13 @@ malloca         [test $REPLACE_EXECLE = 1]
 
 configure.ac:
 gl_FUNC_EXECLE
-if test $REPLACE_EXECLE = 1; then
-  AC_LIBOBJ([execle])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_EXECLE], [test $REPLACE_EXECLE = 1])
 gl_UNISTD_MODULE_INDICATOR([execle])
 
 Makefile.am:
+if GL_COND_OBJ_EXECLE
+lib_SOURCES += execle.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/execlp b/modules/execlp
index b31191c7c4..769b3f4528 100644
--- a/modules/execlp
+++ b/modules/execlp
@@ -12,12 +12,13 @@ malloca         [test $REPLACE_EXECLP = 1]
 
 configure.ac:
 gl_FUNC_EXECLP
-if test $REPLACE_EXECLP = 1; then
-  AC_LIBOBJ([execlp])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_EXECLP], [test $REPLACE_EXECLP = 1])
 gl_UNISTD_MODULE_INDICATOR([execlp])
 
 Makefile.am:
+if GL_COND_OBJ_EXECLP
+lib_SOURCES += execlp.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/execv b/modules/execv
index db64abbe7b..244d79405f 100644
--- a/modules/execv
+++ b/modules/execv
@@ -12,12 +12,13 @@ execve          [test $REPLACE_EXECV = 1]
 
 configure.ac:
 gl_FUNC_EXECV
-if test $REPLACE_EXECV = 1; then
-  AC_LIBOBJ([execv])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_EXECV], [test $REPLACE_EXECV = 1])
 gl_UNISTD_MODULE_INDICATOR([execv])
 
 Makefile.am:
+if GL_COND_OBJ_EXECV
+lib_SOURCES += execv.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/execve b/modules/execve
index ea381a2010..caf0918350 100644
--- a/modules/execve
+++ b/modules/execve
@@ -14,12 +14,13 @@ waitpid         [test $REPLACE_EXECVE = 1]
 
 configure.ac:
 gl_FUNC_EXECVE
-if test $REPLACE_EXECVE = 1; then
-  AC_LIBOBJ([execve])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_EXECVE], [test $REPLACE_EXECVE = 1])
 gl_UNISTD_MODULE_INDICATOR([execve])
 
 Makefile.am:
+if GL_COND_OBJ_EXECVE
+lib_SOURCES += execve.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/execvp b/modules/execvp
index df2d313172..0436444d8c 100644
--- a/modules/execvp
+++ b/modules/execvp
@@ -12,12 +12,13 @@ execvpe         [test $REPLACE_EXECVP = 1]
 
 configure.ac:
 gl_FUNC_EXECVP
-if test $REPLACE_EXECVP = 1; then
-  AC_LIBOBJ([execvp])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_EXECVP], [test $REPLACE_EXECVP = 1])
 gl_UNISTD_MODULE_INDICATOR([execvp])
 
 Makefile.am:
+if GL_COND_OBJ_EXECVP
+lib_SOURCES += execvp.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/execvpe b/modules/execvpe
index e29045dc66..cc486e28d9 100644
--- a/modules/execvpe
+++ b/modules/execvpe
@@ -15,12 +15,14 @@ execve          [test $HAVE_EXECVPE = 0 || test $REPLACE_EXECVPE = 1]
 
 configure.ac:
 gl_FUNC_EXECVPE
-if test $HAVE_EXECVPE = 0 || test $REPLACE_EXECVPE = 1; then
-  AC_LIBOBJ([execvpe])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_EXECVPE],
+               [test $HAVE_EXECVPE = 0 || test $REPLACE_EXECVPE = 1])
 gl_UNISTD_MODULE_INDICATOR([execvpe])
 
 Makefile.am:
+if GL_COND_OBJ_EXECVPE
+lib_SOURCES += execvpe.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/exp2 b/modules/exp2
index 67fe2c1aa1..ca373f17c2 100644
--- a/modules/exp2
+++ b/modules/exp2
@@ -15,12 +15,14 @@ ldexp           [test $HAVE_EXP2 = 0 || test $REPLACE_EXP2 = 1]
 
 configure.ac:
 gl_FUNC_EXP2
-if test $HAVE_EXP2 = 0 || test $REPLACE_EXP2 = 1; then
-  AC_LIBOBJ([exp2])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_EXP2],
+               [test $HAVE_EXP2 = 0 || test $REPLACE_EXP2 = 1])
 gl_MATH_MODULE_INDICATOR([exp2])
 
 Makefile.am:
+if GL_COND_OBJ_EXP2
+lib_SOURCES += exp2.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/exp2f b/modules/exp2f
index cddf153171..708ac7cefa 100644
--- a/modules/exp2f
+++ b/modules/exp2f
@@ -12,12 +12,13 @@ exp2            [test $HAVE_EXP2F = 0]
 
 configure.ac:
 gl_FUNC_EXP2F
-if test $HAVE_EXP2F = 0; then
-  AC_LIBOBJ([exp2f])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_EXP2F], [test $HAVE_EXP2F = 0])
 gl_MATH_MODULE_INDICATOR([exp2f])
 
 Makefile.am:
+if GL_COND_OBJ_EXP2F
+lib_SOURCES += exp2f.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/exp2l b/modules/exp2l
index bb75cf83a9..456d04d66a 100644
--- a/modules/exp2l
+++ b/modules/exp2l
@@ -17,13 +17,17 @@ ldexpl          [{ test $HAVE_EXP2L = 0 || test $REPLACE_EXP2L = 1; } && test $H
 
 configure.ac:
 gl_FUNC_EXP2L
-if test $HAVE_EXP2L = 0 || test $REPLACE_EXP2L = 1; then
-  AC_LIBOBJ([exp2l])
+gl_CONDITIONAL([GL_COND_OBJ_EXP2L],
+               [test $HAVE_EXP2L = 0 || test $REPLACE_EXP2L = 1])
+AM_COND_IF([GL_COND_OBJ_EXP2L], [
   AC_LIBOBJ([expl-table])
-fi
+])
 gl_MATH_MODULE_INDICATOR([exp2l])
 
 Makefile.am:
+if GL_COND_OBJ_EXP2L
+lib_SOURCES += exp2l.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/expf b/modules/expf
index f3c35b7b50..46acd2ea1d 100644
--- a/modules/expf
+++ b/modules/expf
@@ -12,12 +12,13 @@ exp             [test $HAVE_EXPF = 0]
 
 configure.ac:
 gl_FUNC_EXPF
-if test $HAVE_EXPF = 0; then
-  AC_LIBOBJ([expf])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_EXPF], [test $HAVE_EXPF = 0])
 gl_MATH_MODULE_INDICATOR([expf])
 
 Makefile.am:
+if GL_COND_OBJ_EXPF
+lib_SOURCES += expf.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/expl b/modules/expl
index 90a7e65bfd..5bc8dd3bbd 100644
--- a/modules/expl
+++ b/modules/expl
@@ -17,13 +17,17 @@ ldexpl          [{ test $HAVE_EXPL = 0 || test $REPLACE_EXPL = 1; } && test $HAV
 
 configure.ac:
 gl_FUNC_EXPL
-if test $HAVE_EXPL = 0 || test $REPLACE_EXPL = 1; then
-  AC_LIBOBJ([expl])
+gl_CONDITIONAL([GL_COND_OBJ_EXPL],
+               [test $HAVE_EXPL = 0 || test $REPLACE_EXPL = 1])
+AM_COND_IF([GL_COND_OBJ_EXPL], [
   AC_LIBOBJ([expl-table])
-fi
+])
 gl_MATH_MODULE_INDICATOR([expl])
 
 Makefile.am:
+if GL_COND_OBJ_EXPL
+lib_SOURCES += expl.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/explicit_bzero b/modules/explicit_bzero
index 08fd3e4a90..bb5f8a5310 100644
--- a/modules/explicit_bzero
+++ b/modules/explicit_bzero
@@ -11,13 +11,16 @@ string
 
 configure.ac:
 gl_FUNC_EXPLICIT_BZERO
-if test $HAVE_EXPLICIT_BZERO = 0; then
-  AC_LIBOBJ([explicit_bzero])
+gl_CONDITIONAL([GL_COND_OBJ_EXPLICIT_BZERO], [test $HAVE_EXPLICIT_BZERO = 0])
+AM_COND_IF([GL_COND_OBJ_EXPLICIT_BZERO], [
   gl_PREREQ_EXPLICIT_BZERO
-fi
+])
 gl_STRING_MODULE_INDICATOR([explicit_bzero])
 
 Makefile.am:
+if GL_COND_OBJ_EXPLICIT_BZERO
+lib_SOURCES += explicit_bzero.c
+endif
 
 Include:
 <string.h>
diff --git a/modules/expm1 b/modules/expm1
index ef64733320..f351c1c4b2 100644
--- a/modules/expm1
+++ b/modules/expm1
@@ -16,12 +16,14 @@ ldexp           [test $HAVE_EXPM1 = 0 || test $REPLACE_EXPM1 = 1]
 
 configure.ac:
 gl_FUNC_EXPM1
-if test $HAVE_EXPM1 = 0 || test $REPLACE_EXPM1 = 1; then
-  AC_LIBOBJ([expm1])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_EXPM1],
+               [test $HAVE_EXPM1 = 0 || test $REPLACE_EXPM1 = 1])
 gl_MATH_MODULE_INDICATOR([expm1])
 
 Makefile.am:
+if GL_COND_OBJ_EXPM1
+lib_SOURCES += expm1.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/expm1f b/modules/expm1f
index f5e3c35dd8..77de66f4a2 100644
--- a/modules/expm1f
+++ b/modules/expm1f
@@ -12,12 +12,14 @@ expm1           [test $HAVE_EXPM1F = 0 || test $REPLACE_EXPM1F = 1]
 
 configure.ac:
 gl_FUNC_EXPM1F
-if test $HAVE_EXPM1F = 0 || test $REPLACE_EXPM1F = 1; then
-  AC_LIBOBJ([expm1f])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_EXPM1F],
+               [test $HAVE_EXPM1F = 0 || test $REPLACE_EXPM1F = 1])
 gl_MATH_MODULE_INDICATOR([expm1f])
 
 Makefile.am:
+if GL_COND_OBJ_EXPM1F
+lib_SOURCES += expm1f.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/expm1l b/modules/expm1l
index f7137e2e41..34fea130c8 100644
--- a/modules/expm1l
+++ b/modules/expm1l
@@ -17,12 +17,14 @@ ldexpl          [{ test $HAVE_EXPM1L = 0 || test $REPLACE_EXPM1L = 1; } && test
 
 configure.ac:
 gl_FUNC_EXPM1L
-if test $HAVE_EXPM1L = 0 || test $REPLACE_EXPM1L = 1; then
-  AC_LIBOBJ([expm1l])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_EXPM1L],
+               [test $HAVE_EXPM1L = 0 || test $REPLACE_EXPM1L = 1])
 gl_MATH_MODULE_INDICATOR([expm1l])
 
 Makefile.am:
+if GL_COND_OBJ_EXPM1L
+lib_SOURCES += expm1l.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/fabsf b/modules/fabsf
index 7083a90ac6..ce9fbcbc36 100644
--- a/modules/fabsf
+++ b/modules/fabsf
@@ -13,12 +13,13 @@ fabs            [test $HAVE_FABSF = 0]
 
 configure.ac:
 gl_FUNC_FABSF
-if test $HAVE_FABSF = 0; then
-  AC_LIBOBJ([fabsf])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_FABSF], [test $HAVE_FABSF = 0])
 gl_MATH_MODULE_INDICATOR([fabsf])
 
 Makefile.am:
+if GL_COND_OBJ_FABSF
+lib_SOURCES += fabsf.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/fabsl b/modules/fabsl
index 7ed9f92b0e..9dab45ea1f 100644
--- a/modules/fabsl
+++ b/modules/fabsl
@@ -14,12 +14,14 @@ signbit         [{ test $HAVE_FABSL = 0 || test $REPLACE_FABSL = 1; } && test $H
 
 configure.ac:
 gl_FUNC_FABSL
-if test $HAVE_FABSL = 0 || test $REPLACE_FABSL = 1; then
-  AC_LIBOBJ([fabsl])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_FABSL],
+               [test $HAVE_FABSL = 0 || test $REPLACE_FABSL = 1])
 gl_MATH_MODULE_INDICATOR([fabsl])
 
 Makefile.am:
+if GL_COND_OBJ_FABSL
+lib_SOURCES += fabsl.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/faccessat b/modules/faccessat
index 49098a210c..a86c099271 100644
--- a/modules/faccessat
+++ b/modules/faccessat
@@ -22,14 +22,18 @@ euidaccess      [test $HAVE_FACCESSAT = 0 || test $REPLACE_FACCESSAT = 1]
 
 configure.ac:
 gl_FUNC_FACCESSAT
-if test $HAVE_FACCESSAT = 0 || test $REPLACE_FACCESSAT = 1; then
-  AC_LIBOBJ([faccessat])
+gl_CONDITIONAL([GL_COND_OBJ_FACCESSAT],
+               [test $HAVE_FACCESSAT = 0 || test $REPLACE_FACCESSAT = 1])
+AM_COND_IF([GL_COND_OBJ_FACCESSAT], [
   gl_PREREQ_FACCESSAT
-fi
+])
 gl_MODULE_INDICATOR([faccessat])
 gl_UNISTD_MODULE_INDICATOR([faccessat])
 
 Makefile.am:
+if GL_COND_OBJ_FACCESSAT
+lib_SOURCES += faccessat.c
+endif
 
 Include:
 <fcntl.h>
diff --git a/modules/fchdir b/modules/fchdir
index 967e648b06..13437a92f1 100644
--- a/modules/fchdir
+++ b/modules/fchdir
@@ -30,13 +30,16 @@ sys_stat         [test $HAVE_FCHDIR = 0]
 
 configure.ac:
 gl_FUNC_FCHDIR
-if test $HAVE_FCHDIR = 0; then
-  AC_LIBOBJ([fchdir])
+gl_CONDITIONAL([GL_COND_OBJ_FCHDIR], [test $HAVE_FCHDIR = 0])
+AM_COND_IF([GL_COND_OBJ_FCHDIR], [
   gl_PREREQ_FCHDIR
-fi
+])
 gl_UNISTD_MODULE_INDICATOR([fchdir])
 
 Makefile.am:
+if GL_COND_OBJ_FCHDIR
+lib_SOURCES += fchdir.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/fchmodat b/modules/fchmodat
index 17cfe392fd..26758bda86 100644
--- a/modules/fchmodat
+++ b/modules/fchmodat
@@ -26,13 +26,17 @@ save-cwd        [test $HAVE_FCHMODAT = 0]
 
 configure.ac:
 gl_FUNC_FCHMODAT
-if test $HAVE_FCHMODAT = 0 || test $REPLACE_FCHMODAT = 1; then
-  AC_LIBOBJ([fchmodat])
+gl_CONDITIONAL([GL_COND_OBJ_FCHMODAT],
+               [test $HAVE_FCHMODAT = 0 || test $REPLACE_FCHMODAT = 1])
+AM_COND_IF([GL_COND_OBJ_FCHMODAT], [
   gl_PREREQ_FCHMODAT
-fi
+])
 gl_SYS_STAT_MODULE_INDICATOR([fchmodat])
 
 Makefile.am:
+if GL_COND_OBJ_FCHMODAT
+lib_SOURCES += fchmodat.c
+endif
 
 Include:
 <sys/stat.h>
diff --git a/modules/fchownat b/modules/fchownat
index e14544ab2b..ea2f2e678c 100644
--- a/modules/fchownat
+++ b/modules/fchownat
@@ -23,12 +23,14 @@ statat          [test $REPLACE_FCHOWNAT = 1]
 
 configure.ac:
 gl_FUNC_FCHOWNAT
-if test $HAVE_FCHOWNAT = 0 || test $REPLACE_FCHOWNAT = 1; then
-  AC_LIBOBJ([fchownat])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_FCHOWNAT],
+               [test $HAVE_FCHOWNAT = 0 || test $REPLACE_FCHOWNAT = 1])
 gl_UNISTD_MODULE_INDICATOR([fchownat])
 
 Makefile.am:
+if GL_COND_OBJ_FCHOWNAT
+lib_SOURCES += fchownat.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/fclose b/modules/fclose
index f34e96ab9c..703de9e686 100644
--- a/modules/fclose
+++ b/modules/fclose
@@ -15,12 +15,13 @@ msvc-inval      [test $REPLACE_FCLOSE = 1]
 
 configure.ac:
 gl_FUNC_FCLOSE
-if test $REPLACE_FCLOSE = 1; then
-  AC_LIBOBJ([fclose])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_FCLOSE], [test $REPLACE_FCLOSE = 1])
 gl_STDIO_MODULE_INDICATOR([fclose])
 
 Makefile.am:
+if GL_COND_OBJ_FCLOSE
+lib_SOURCES += fclose.c
+endif
 
 Include:
 <stdio.h>
diff --git a/modules/fcntl b/modules/fcntl
index 3ee0811c87..ad5d6e9366 100644
--- a/modules/fcntl
+++ b/modules/fcntl
@@ -15,12 +15,14 @@ msvc-nothrow    [test $HAVE_FCNTL = 0 || test $REPLACE_FCNTL = 1]
 
 configure.ac:
 gl_FUNC_FCNTL
-if test $HAVE_FCNTL = 0 || test $REPLACE_FCNTL = 1; then
-  AC_LIBOBJ([fcntl])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_FCNTL],
+               [test $HAVE_FCNTL = 0 || test $REPLACE_FCNTL = 1])
 gl_FCNTL_MODULE_INDICATOR([fcntl])
 
 Makefile.am:
+if GL_COND_OBJ_FCNTL
+lib_SOURCES += fcntl.c
+endif
 
 Include:
 <fcntl.h>
diff --git a/modules/fdatasync b/modules/fdatasync
index 62f710d9e5..bff4dc3a69 100644
--- a/modules/fdatasync
+++ b/modules/fdatasync
@@ -11,12 +11,13 @@ unistd
 
 configure.ac:
 gl_FUNC_FDATASYNC
-if test $HAVE_FDATASYNC = 0; then
-  AC_LIBOBJ([fdatasync])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_FDATASYNC], [test $HAVE_FDATASYNC = 0])
 gl_UNISTD_MODULE_INDICATOR([fdatasync])
 
 Makefile.am:
+if GL_COND_OBJ_FDATASYNC
+lib_SOURCES += fdatasync.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/fdopen b/modules/fdopen
index a1d0280934..c3af75a013 100644
--- a/modules/fdopen
+++ b/modules/fdopen
@@ -11,13 +11,16 @@ msvc-inval      [test $REPLACE_FDOPEN = 1]
 
 configure.ac:
 gl_FUNC_FDOPEN
-if test $REPLACE_FDOPEN = 1; then
-  AC_LIBOBJ([fdopen])
+gl_CONDITIONAL([GL_COND_OBJ_FDOPEN], [test $REPLACE_FDOPEN = 1])
+AM_COND_IF([GL_COND_OBJ_FDOPEN], [
   gl_PREREQ_FDOPEN
-fi
+])
 gl_STDIO_MODULE_INDICATOR([fdopen])
 
 Makefile.am:
+if GL_COND_OBJ_FDOPEN
+lib_SOURCES += fdopen.c
+endif
 
 Include:
 <stdio.h>
diff --git a/modules/fdopendir b/modules/fdopendir
index 2d03867ecc..2dec790167 100644
--- a/modules/fdopendir
+++ b/modules/fdopendir
@@ -20,13 +20,15 @@ save-cwd        [test $HAVE_FDOPENDIR = 0]
 
 configure.ac:
 gl_FUNC_FDOPENDIR
-if test $HAVE_FDOPENDIR = 0 || test $REPLACE_FDOPENDIR = 1; then
-  AC_LIBOBJ([fdopendir])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_FDOPENDIR],
+               [test $HAVE_FDOPENDIR = 0 || test $REPLACE_FDOPENDIR = 1])
 gl_DIRENT_MODULE_INDICATOR([fdopendir])
 gl_MODULE_INDICATOR([fdopendir])
 
 Makefile.am:
+if GL_COND_OBJ_FDOPENDIR
+lib_SOURCES += fdopendir.c
+endif
 
 Include:
 <dirent.h>
diff --git a/modules/fflush b/modules/fflush
index bda975a2a5..c12ab70138 100644
--- a/modules/fflush
+++ b/modules/fflush
@@ -20,14 +20,17 @@ AC_REQUIRE([gl_SET_LARGEFILE_SOURCE])
 
 configure.ac:
 gl_FUNC_FFLUSH
-if test $REPLACE_FFLUSH = 1; then
-  AC_LIBOBJ([fflush])
+gl_CONDITIONAL([GL_COND_OBJ_FFLUSH], [test $REPLACE_FFLUSH = 1])
+AM_COND_IF([GL_COND_OBJ_FFLUSH], [
   gl_PREREQ_FFLUSH
-fi
+])
 gl_MODULE_INDICATOR([fflush])
 gl_STDIO_MODULE_INDICATOR([fflush])
 
 Makefile.am:
+if GL_COND_OBJ_FFLUSH
+lib_SOURCES += fflush.c
+endif
 
 Include:
 <stdio.h>
diff --git a/modules/ffs b/modules/ffs
index 7d032b02a8..90980fd728 100644
--- a/modules/ffs
+++ b/modules/ffs
@@ -10,12 +10,13 @@ strings
 
 configure.ac:
 gl_FUNC_FFS
-if test $HAVE_FFS = 0; then
-  AC_LIBOBJ([ffs])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_FFS], [test $HAVE_FFS = 0])
 gl_STRINGS_MODULE_INDICATOR([ffs])
 
 Makefile.am:
+if GL_COND_OBJ_FFS
+lib_SOURCES += ffs.c
+endif
 
 Include:
 <strings.h>
diff --git a/modules/ffsl b/modules/ffsl
index a3217ec08e..02990c761d 100644
--- a/modules/ffsl
+++ b/modules/ffsl
@@ -13,12 +13,13 @@ ffs             [test $HAVE_FFSL = 0]
 
 configure.ac:
 gl_FUNC_FFSL
-if test $HAVE_FFSL = 0; then
-  AC_LIBOBJ([ffsl])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_FFSL], [test $HAVE_FFSL = 0])
 gl_STRING_MODULE_INDICATOR([ffsl])
 
 Makefile.am:
+if GL_COND_OBJ_FFSL
+lib_SOURCES += ffsl.c
+endif
 
 Include:
 <string.h>
diff --git a/modules/ffsll b/modules/ffsll
index dea0d97e80..e215301a72 100644
--- a/modules/ffsll
+++ b/modules/ffsll
@@ -13,12 +13,14 @@ ffs             [test $HAVE_FFSLL = 0 || test $REPLACE_FFSLL = 1]
 
 configure.ac:
 gl_FUNC_FFSLL
-if test $HAVE_FFSLL = 0 || test $REPLACE_FFSLL = 1; then
-  AC_LIBOBJ([ffsll])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_FFSLL],
+               [test $HAVE_FFSLL = 0 || test $REPLACE_FFSLL = 1])
 gl_STRING_MODULE_INDICATOR([ffsll])
 
 Makefile.am:
+if GL_COND_OBJ_FFSLL
+lib_SOURCES += ffsll.c
+endif
 
 Include:
 <string.h>
diff --git a/modules/fileblocks b/modules/fileblocks
index 2deff815ee..5647da233c 100644
--- a/modules/fileblocks
+++ b/modules/fileblocks
@@ -9,12 +9,16 @@ Depends-on:
 
 configure.ac:
 gl_FILEBLOCKS
-if test $ac_cv_member_struct_stat_st_blocks = no; then
-  AC_LIBOBJ([fileblocks])
+gl_CONDITIONAL([GL_COND_OBJ_FILEBLOCKS],
+               [test $ac_cv_member_struct_stat_st_blocks = no])
+AM_COND_IF([GL_COND_OBJ_FILEBLOCKS], [
   gl_PREREQ_FILEBLOCKS
-fi
+])
 
 Makefile.am:
+if GL_COND_OBJ_FILEBLOCKS
+lib_SOURCES += fileblocks.c
+endif
 
 Include:
 
diff --git a/modules/float b/modules/float
index d308d4412f..600de5ebee 100644
--- a/modules/float
+++ b/modules/float
@@ -15,12 +15,8 @@ configure.ac:
 gl_FLOAT_H
 gl_CONDITIONAL_HEADER([float.h])
 AC_PROG_MKDIR_P
-if test $REPLACE_FLOAT_LDBL = 1; then
-  AC_LIBOBJ([float])
-fi
-if test $REPLACE_ITOLD = 1; then
-  AC_LIBOBJ([itold])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_FLOAT], [test $REPLACE_FLOAT_LDBL = 1])
+gl_CONDITIONAL([GL_COND_OBJ_ITOLD], [test $REPLACE_ITOLD = 1])
 
 Makefile.am:
 BUILT_SOURCES += $(FLOAT_H)
@@ -45,6 +41,13 @@ float.h: $(top_builddir)/config.status
 endif
 MOSTLYCLEANFILES += float.h float.h-t
 
+if GL_COND_OBJ_FLOAT
+lib_SOURCES += float.c
+endif
+if GL_COND_OBJ_ITOLD
+lib_SOURCES += itold.c
+endif
+
 Include:
 <float.h>
 
diff --git a/modules/flock b/modules/flock
index f45f616370..75ce48e584 100644
--- a/modules/flock
+++ b/modules/flock
@@ -11,13 +11,16 @@ msvc-nothrow    [test $HAVE_FLOCK = 0]
 
 configure.ac:
 gl_FUNC_FLOCK
-if test $HAVE_FLOCK = 0; then
-  AC_LIBOBJ([flock])
+gl_CONDITIONAL([GL_COND_OBJ_FLOCK], [test $HAVE_FLOCK = 0])
+AM_COND_IF([GL_COND_OBJ_FLOCK], [
   gl_PREREQ_FLOCK
-fi
+])
 gl_SYS_FILE_MODULE_INDICATOR([flock])
 
 Makefile.am:
+if GL_COND_OBJ_FLOCK
+lib_SOURCES += flock.c
+endif
 
 Include:
 <sys/file.h>
diff --git a/modules/floor b/modules/floor
index bd7d90dc7d..23557eb8ad 100644
--- a/modules/floor
+++ b/modules/floor
@@ -11,12 +11,13 @@ float           [test $REPLACE_FLOOR = 1]
 
 configure.ac:
 AC_REQUIRE([gl_FUNC_FLOOR])
-if test $REPLACE_FLOOR = 1; then
-  AC_LIBOBJ([floor])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_FLOOR], [test $REPLACE_FLOOR = 1])
 gl_MATH_MODULE_INDICATOR([floor])
 
 Makefile.am:
+if GL_COND_OBJ_FLOOR
+lib_SOURCES += floor.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/floorf b/modules/floorf
index cbf05d4dc0..f5a31d8c39 100644
--- a/modules/floorf
+++ b/modules/floorf
@@ -13,12 +13,14 @@ float           [test $HAVE_DECL_FLOORF = 0 || test $REPLACE_FLOORF = 1]
 
 configure.ac:
 gl_FUNC_FLOORF
-if test $HAVE_DECL_FLOORF = 0 || test $REPLACE_FLOORF = 1; then
-  AC_LIBOBJ([floorf])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_FLOORF],
+               [test $HAVE_DECL_FLOORF = 0 || test $REPLACE_FLOORF = 1])
 gl_MATH_MODULE_INDICATOR([floorf])
 
 Makefile.am:
+if GL_COND_OBJ_FLOORF
+lib_SOURCES += floorf.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/floorl b/modules/floorl
index e3450f8653..3e796ca42f 100644
--- a/modules/floorl
+++ b/modules/floorl
@@ -14,12 +14,14 @@ float           [{ test $HAVE_DECL_FLOORL = 0 || test $REPLACE_FLOORL = 1; } &&
 
 configure.ac:
 AC_REQUIRE([gl_FUNC_FLOORL])
-if test $HAVE_DECL_FLOORL = 0 || test $REPLACE_FLOORL = 1; then
-  AC_LIBOBJ([floorl])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_FLOORL],
+               [test $HAVE_DECL_FLOORL = 0 || test $REPLACE_FLOORL = 1])
 gl_MATH_MODULE_INDICATOR([floorl])
 
 Makefile.am:
+if GL_COND_OBJ_FLOORL
+lib_SOURCES += floorl.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/fma b/modules/fma
index 0d6558f36b..dc45a94826 100644
--- a/modules/fma
+++ b/modules/fma
@@ -20,13 +20,16 @@ ldexp           [test $HAVE_FMA = 0 || test $REPLACE_FMA = 1]
 
 configure.ac:
 gl_FUNC_FMA
-if test $HAVE_FMA = 0 || test $REPLACE_FMA = 1; then
-  AC_LIBOBJ([fma])
+gl_CONDITIONAL([GL_COND_OBJ_FMA], [test $HAVE_FMA = 0 || test $REPLACE_FMA = 1])
+AM_COND_IF([GL_COND_OBJ_FMA], [
   gl_PREREQ_FMA
-fi
+])
 gl_MATH_MODULE_INDICATOR([fma])
 
 Makefile.am:
+if GL_COND_OBJ_FMA
+lib_SOURCES += fma.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/fmaf b/modules/fmaf
index cbfea61b58..53fe229c10 100644
--- a/modules/fmaf
+++ b/modules/fmaf
@@ -22,13 +22,17 @@ ldexpf          [test $HAVE_FMAF = 0 || test $REPLACE_FMAF = 1]
 
 configure.ac:
 gl_FUNC_FMAF
-if test $HAVE_FMAF = 0 || test $REPLACE_FMAF = 1; then
-  AC_LIBOBJ([fmaf])
+gl_CONDITIONAL([GL_COND_OBJ_FMAF],
+               [test $HAVE_FMAF = 0 || test $REPLACE_FMAF = 1])
+AM_COND_IF([GL_COND_OBJ_FMAF], [
   gl_PREREQ_FMAF
-fi
+])
 gl_MATH_MODULE_INDICATOR([fmaf])
 
 Makefile.am:
+if GL_COND_OBJ_FMAF
+lib_SOURCES += fmaf.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/fmal b/modules/fmal
index 72c38d51d2..e24ff02a95 100644
--- a/modules/fmal
+++ b/modules/fmal
@@ -23,13 +23,17 @@ ldexpl          [{ test $HAVE_FMAL = 0 || test $REPLACE_FMAL = 1; } && test $HAV
 
 configure.ac:
 gl_FUNC_FMAL
-if test $HAVE_FMAL = 0 || test $REPLACE_FMAL = 1; then
-  AC_LIBOBJ([fmal])
+gl_CONDITIONAL([GL_COND_OBJ_FMAL],
+               [test $HAVE_FMAL = 0 || test $REPLACE_FMAL = 1])
+AM_COND_IF([GL_COND_OBJ_FMAL], [
   gl_PREREQ_FMAL
-fi
+])
 gl_MATH_MODULE_INDICATOR([fmal])
 
 Makefile.am:
+if GL_COND_OBJ_FMAL
+lib_SOURCES += fmal.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/fmod b/modules/fmod
index 0acfb4e4e8..1711d29164 100644
--- a/modules/fmod
+++ b/modules/fmod
@@ -19,12 +19,13 @@ isinf           [test $REPLACE_FMOD = 1]
 
 configure.ac:
 gl_FUNC_FMOD
-if test $REPLACE_FMOD = 1; then
-  AC_LIBOBJ([fmod])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_FMOD], [test $REPLACE_FMOD = 1])
 gl_MATH_MODULE_INDICATOR([fmod])
 
 Makefile.am:
+if GL_COND_OBJ_FMOD
+lib_SOURCES += fmod.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/fmodf b/modules/fmodf
index 2d65f43785..5608ac2dfa 100644
--- a/modules/fmodf
+++ b/modules/fmodf
@@ -12,12 +12,14 @@ fmod            [test $HAVE_FMODF = 0 || test $REPLACE_FMODF = 1]
 
 configure.ac:
 gl_FUNC_FMODF
-if test $HAVE_FMODF = 0 || test $REPLACE_FMODF = 1; then
-  AC_LIBOBJ([fmodf])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_FMODF],
+               [test $HAVE_FMODF = 0 || test $REPLACE_FMODF = 1])
 gl_MATH_MODULE_INDICATOR([fmodf])
 
 Makefile.am:
+if GL_COND_OBJ_FMODF
+lib_SOURCES += fmodf.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/fmodl b/modules/fmodl
index f1ac6f8881..8425394e5f 100644
--- a/modules/fmodl
+++ b/modules/fmodl
@@ -23,12 +23,14 @@ isinf           [{ test $HAVE_FMODL = 0 || test $REPLACE_FMODL = 1; } && test $H
 
 configure.ac:
 gl_FUNC_FMODL
-if test $HAVE_FMODL = 0 || test $REPLACE_FMODL = 1; then
-  AC_LIBOBJ([fmodl])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_FMODL],
+               [test $HAVE_FMODL = 0 || test $REPLACE_FMODL = 1])
 gl_MATH_MODULE_INDICATOR([fmodl])
 
 Makefile.am:
+if GL_COND_OBJ_FMODL
+lib_SOURCES += fmodl.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/forkpty b/modules/forkpty
index fdf5fe4fbd..1f52b900cd 100644
--- a/modules/forkpty
+++ b/modules/forkpty
@@ -14,12 +14,14 @@ login_tty
 
 configure.ac:
 gl_FUNC_FORKPTY
-if test $HAVE_FORKPTY = 0 || test $REPLACE_FORKPTY = 1; then
-  AC_LIBOBJ([forkpty])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_FORKPTY],
+               [test $HAVE_FORKPTY = 0 || test $REPLACE_FORKPTY = 1])
 gl_PTY_MODULE_INDICATOR([forkpty])
 
 Makefile.am:
+if GL_COND_OBJ_FORKPTY
+lib_SOURCES += forkpty.c
+endif
 
 Include:
 <pty.h>
diff --git a/modules/fpending b/modules/fpending
index 8dc4bee427..0aa326d1b0 100644
--- a/modules/fpending
+++ b/modules/fpending
@@ -11,11 +11,12 @@ Depends-on:
 
 configure.ac:
 gl_FUNC_FPENDING
-if test $gl_cv_func___fpending = no; then
-  AC_LIBOBJ([fpending])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_FPENDING], [test $gl_cv_func___fpending = no])
 
 Makefile.am:
+if GL_COND_OBJ_FPENDING
+lib_SOURCES += fpending.c
+endif
 
 Include:
 "fpending.h"
diff --git a/modules/fpurge b/modules/fpurge
index 54ab9ffd46..4834e41916 100644
--- a/modules/fpurge
+++ b/modules/fpurge
@@ -11,12 +11,14 @@ stdio
 
 configure.ac:
 gl_FUNC_FPURGE
-if test $HAVE_FPURGE = 0 || test $REPLACE_FPURGE = 1; then
-  AC_LIBOBJ([fpurge])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_FPURGE],
+               [test $HAVE_FPURGE = 0 || test $REPLACE_FPURGE = 1])
 gl_STDIO_MODULE_INDICATOR([fpurge])
 
 Makefile.am:
+if GL_COND_OBJ_FPURGE
+lib_SOURCES += fpurge.c
+endif
 
 Include:
 <stdio.h>
diff --git a/modules/freadable b/modules/freadable
index 35e42a88ce..66267ec6cd 100644
--- a/modules/freadable
+++ b/modules/freadable
@@ -12,11 +12,12 @@ stdbool
 
 configure.ac:
 gl_FUNC_FREADABLE
-if test $ac_cv_func___freadable = no; then
-  AC_LIBOBJ([freadable])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_FREADABLE], [test $ac_cv_func___freadable = no])
 
 Makefile.am:
+if GL_COND_OBJ_FREADABLE
+lib_SOURCES += freadable.c
+endif
 
 Include:
 "freadable.h"
diff --git a/modules/freadahead b/modules/freadahead
index ccd70fad74..ae9c63c2f2 100644
--- a/modules/freadahead
+++ b/modules/freadahead
@@ -12,11 +12,12 @@ Depends-on:
 
 configure.ac:
 gl_FUNC_FREADAHEAD
-if test $ac_cv_func___freadahead = no; then
-  AC_LIBOBJ([freadahead])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_FREADAHEAD], [test $ac_cv_func___freadahead = no])
 
 Makefile.am:
+if GL_COND_OBJ_FREADAHEAD
+lib_SOURCES += freadahead.c
+endif
 
 Include:
 "freadahead.h"
diff --git a/modules/freadptr b/modules/freadptr
index 7d56c90ec8..2925d22ba3 100644
--- a/modules/freadptr
+++ b/modules/freadptr
@@ -11,11 +11,12 @@ Depends-on:
 
 configure.ac:
 gl_FUNC_FREADPTR
-if test $ac_cv_func___freadptr = no; then
-  AC_LIBOBJ([freadptr])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_FREADPTR], [test $ac_cv_func___freadptr = no])
 
 Makefile.am:
+if GL_COND_OBJ_FREADPTR
+lib_SOURCES += freadptr.c
+endif
 
 Include:
 "freadptr.h"
diff --git a/modules/free-posix b/modules/free-posix
index 1d0056327a..9d18421b64 100644
--- a/modules/free-posix
+++ b/modules/free-posix
@@ -12,13 +12,16 @@ wchar
 
 configure.ac:
 gl_FUNC_FREE
-if test $REPLACE_FREE = 1; then
-  AC_LIBOBJ([free])
+gl_CONDITIONAL([GL_COND_OBJ_FREE], [test $REPLACE_FREE = 1])
+AM_COND_IF([GL_COND_OBJ_FREE], [
   gl_PREREQ_FREE
-fi
+])
 gl_STDLIB_MODULE_INDICATOR([free-posix])
 
 Makefile.am:
+if GL_COND_OBJ_FREE
+lib_SOURCES += free.c
+endif
 
 Include:
 <stdlib.h>
diff --git a/modules/freopen b/modules/freopen
index 41236bd533..c7bcdc04e6 100644
--- a/modules/freopen
+++ b/modules/freopen
@@ -13,13 +13,16 @@ largefile
 
 configure.ac:
 gl_FUNC_FREOPEN
-if test $REPLACE_FREOPEN = 1; then
-  AC_LIBOBJ([freopen])
+gl_CONDITIONAL([GL_COND_OBJ_FREOPEN], [test $REPLACE_FREOPEN = 1])
+AM_COND_IF([GL_COND_OBJ_FREOPEN], [
   gl_PREREQ_FREOPEN
-fi
+])
 gl_STDIO_MODULE_INDICATOR([freopen])
 
 Makefile.am:
+if GL_COND_OBJ_FREOPEN
+lib_SOURCES += freopen.c
+endif
 
 Include:
 <stdio.h>
diff --git a/modules/frexpf b/modules/frexpf
index dd6f63af15..60381d6c88 100644
--- a/modules/frexpf
+++ b/modules/frexpf
@@ -13,12 +13,14 @@ frexp           [test $HAVE_FREXPF = 0 || test $REPLACE_FREXPF = 1]
 
 configure.ac:
 gl_FUNC_FREXPF
-if test $HAVE_FREXPF = 0 || test $REPLACE_FREXPF = 1; then
-  AC_LIBOBJ([frexpf])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_FREXPF],
+               [test $HAVE_FREXPF = 0 || test $REPLACE_FREXPF = 1])
 gl_MATH_MODULE_INDICATOR([frexpf])
 
 Makefile.am:
+if GL_COND_OBJ_FREXPF
+lib_SOURCES += frexpf.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/fseek b/modules/fseek
index 9a90ac29dd..64b9a9a56b 100644
--- a/modules/fseek
+++ b/modules/fseek
@@ -11,12 +11,13 @@ fseeko          [test $REPLACE_FSEEK = 1]
 
 configure.ac:
 gl_FUNC_FSEEK
-if test $REPLACE_FSEEK = 1; then
-  AC_LIBOBJ([fseek])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_FSEEK], [test $REPLACE_FSEEK = 1])
 gl_STDIO_MODULE_INDICATOR([fseek])
 
 Makefile.am:
+if GL_COND_OBJ_FSEEK
+lib_SOURCES += fseek.c
+endif
 
 Include:
 <stdio.h>
diff --git a/modules/fseeko b/modules/fseeko
index 83db09cc30..d47763f24e 100644
--- a/modules/fseeko
+++ b/modules/fseeko
@@ -20,13 +20,17 @@ AC_REQUIRE([gl_SET_LARGEFILE_SOURCE])
 
 configure.ac:
 gl_FUNC_FSEEKO
-if test $HAVE_FSEEKO = 0 || test $REPLACE_FSEEKO = 1; then
-  AC_LIBOBJ([fseeko])
+gl_CONDITIONAL([GL_COND_OBJ_FSEEKO],
+               [test $HAVE_FSEEKO = 0 || test $REPLACE_FSEEKO = 1])
+AM_COND_IF([GL_COND_OBJ_FSEEKO], [
   gl_PREREQ_FSEEKO
-fi
+])
 gl_STDIO_MODULE_INDICATOR([fseeko])
 
 Makefile.am:
+if GL_COND_OBJ_FSEEKO
+lib_SOURCES += fseeko.c
+endif
 
 Include:
 <stdio.h>
diff --git a/modules/fseterr b/modules/fseterr
index 7fa7ecd281..999a3a57b9 100644
--- a/modules/fseterr
+++ b/modules/fseterr
@@ -11,11 +11,12 @@ Depends-on:
 
 configure.ac:
 gl_FUNC_FSETERR
-if test $ac_cv_func___fseterr = no; then
-  AC_LIBOBJ([fseterr])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_FSETERR], [test $ac_cv_func___fseterr = no])
 
 Makefile.am:
+if GL_COND_OBJ_FSETERR
+lib_SOURCES += fseterr.c
+endif
 
 Include:
 "fseterr.h"
diff --git a/modules/fstat b/modules/fstat
index e88bb43653..508aa76a22 100644
--- a/modules/fstat
+++ b/modules/fstat
@@ -19,18 +19,21 @@ msvc-nothrow    [test $REPLACE_FSTAT = 1]
 
 configure.ac:
 gl_FUNC_FSTAT
-if test $REPLACE_FSTAT = 1; then
-  AC_LIBOBJ([fstat])
+gl_CONDITIONAL([GL_COND_OBJ_FSTAT], [test $REPLACE_FSTAT = 1])
+AM_COND_IF([GL_COND_OBJ_FSTAT], [
   case "$host_os" in
     mingw*)
       AC_LIBOBJ([stat-w32])
       ;;
   esac
   gl_PREREQ_FSTAT
-fi
+])
 gl_SYS_STAT_MODULE_INDICATOR([fstat])
 
 Makefile.am:
+if GL_COND_OBJ_FSTAT
+lib_SOURCES += fstat.c
+endif
 
 Include:
 <sys/stat.h>
diff --git a/modules/fstatat b/modules/fstatat
index 985ea0cda4..c2c12c6112 100644
--- a/modules/fstatat
+++ b/modules/fstatat
@@ -25,12 +25,14 @@ stat-time       [test $HAVE_FSTATAT = 0 || test $REPLACE_FSTATAT = 1]
 
 configure.ac:
 gl_FUNC_FSTATAT
-if test $HAVE_FSTATAT = 0 || test $REPLACE_FSTATAT = 1; then
-  AC_LIBOBJ([fstatat])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_FSTATAT],
+               [test $HAVE_FSTATAT = 0 || test $REPLACE_FSTATAT = 1])
 gl_SYS_STAT_MODULE_INDICATOR([fstatat])
 
 Makefile.am:
+if GL_COND_OBJ_FSTATAT
+lib_SOURCES += fstatat.c
+endif
 
 Include:
 <sys/stat.h>
diff --git a/modules/fsusage b/modules/fsusage
index b5344c4264..7cbca5e1c3 100644
--- a/modules/fsusage
+++ b/modules/fsusage
@@ -14,12 +14,15 @@ stdint
 
 configure.ac:
 gl_FSUSAGE
-if test $gl_cv_fs_space = yes; then
-  AC_LIBOBJ([fsusage])
+gl_CONDITIONAL([GL_COND_OBJ_FSUSAGE], [test $gl_cv_fs_space = yes])
+AM_COND_IF([GL_COND_OBJ_FSUSAGE], [
   gl_PREREQ_FSUSAGE_EXTRA
-fi
+])
 
 Makefile.am:
+if GL_COND_OBJ_FSUSAGE
+lib_SOURCES += fsusage.c
+endif
 
 Include:
 "fsusage.h"
diff --git a/modules/fsync b/modules/fsync
index 660eb59bc0..3475933579 100644
--- a/modules/fsync
+++ b/modules/fsync
@@ -11,13 +11,16 @@ msvc-nothrow    [test $HAVE_FSYNC = 0]
 
 configure.ac:
 gl_FUNC_FSYNC
-if test $HAVE_FSYNC = 0; then
-  AC_LIBOBJ([fsync])
+gl_CONDITIONAL([GL_COND_OBJ_FSYNC], [test $HAVE_FSYNC = 0])
+AM_COND_IF([GL_COND_OBJ_FSYNC], [
   gl_PREREQ_FSYNC
-fi
+])
 gl_UNISTD_MODULE_INDICATOR([fsync])
 
 Makefile.am:
+if GL_COND_OBJ_FSYNC
+lib_SOURCES += fsync.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/ftell b/modules/ftell
index 2f86fd2e21..d9d754d917 100644
--- a/modules/ftell
+++ b/modules/ftell
@@ -12,12 +12,13 @@ ftello          [test $REPLACE_FTELL = 1]
 
 configure.ac:
 gl_FUNC_FTELL
-if test $REPLACE_FTELL = 1; then
-  AC_LIBOBJ([ftell])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_FTELL], [test $REPLACE_FTELL = 1])
 gl_STDIO_MODULE_INDICATOR([ftell])
 
 Makefile.am:
+if GL_COND_OBJ_FTELL
+lib_SOURCES += ftell.c
+endif
 
 Include:
 <stdio.h>
diff --git a/modules/ftello b/modules/ftello
index fc6bafbc64..d5cf73468a 100644
--- a/modules/ftello
+++ b/modules/ftello
@@ -23,13 +23,17 @@ AC_REQUIRE([gl_SET_LARGEFILE_SOURCE])
 
 configure.ac:
 gl_FUNC_FTELLO
-if test $HAVE_FTELLO = 0 || test $REPLACE_FTELLO = 1; then
-  AC_LIBOBJ([ftello])
+gl_CONDITIONAL([GL_COND_OBJ_FTELLO],
+               [test $HAVE_FTELLO = 0 || test $REPLACE_FTELLO = 1])
+AM_COND_IF([GL_COND_OBJ_FTELLO], [
   gl_PREREQ_FTELLO
-fi
+])
 gl_STDIO_MODULE_INDICATOR([ftello])
 
 Makefile.am:
+if GL_COND_OBJ_FTELLO
+lib_SOURCES += ftello.c
+endif
 
 Include:
 <stdio.h>
diff --git a/modules/ftruncate b/modules/ftruncate
index 5a8913975b..c8e58ca940 100644
--- a/modules/ftruncate
+++ b/modules/ftruncate
@@ -14,13 +14,17 @@ msvc-inval      [test $HAVE_FTRUNCATE = 0 || test $REPLACE_FTRUNCATE = 1]
 
 configure.ac:
 gl_FUNC_FTRUNCATE
-if test $HAVE_FTRUNCATE = 0 || test $REPLACE_FTRUNCATE = 1; then
-  AC_LIBOBJ([ftruncate])
+gl_CONDITIONAL([GL_COND_OBJ_FTRUNCATE],
+               [test $HAVE_FTRUNCATE = 0 || test $REPLACE_FTRUNCATE = 1])
+AM_COND_IF([GL_COND_OBJ_FTRUNCATE], [
   gl_PREREQ_FTRUNCATE
-fi
+])
 gl_UNISTD_MODULE_INDICATOR([ftruncate])
 
 Makefile.am:
+if GL_COND_OBJ_FTRUNCATE
+lib_SOURCES += ftruncate.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/fts b/modules/fts
index 4f49b88f8a..e5443adb2f 100644
--- a/modules/fts
+++ b/modules/fts
@@ -36,9 +36,12 @@ configure.ac:
 gl_FUNC_FTS
 dnl Use this version of fts unconditionally, since the GNU libc and
 dnl NetBSD versions have bugs and/or unnecessary limitations.
-AC_LIBOBJ([fts])
+gl_CONDITIONAL([GL_COND_OBJ_FTS], [true])
 
 Makefile.am:
+if GL_COND_OBJ_FTS
+lib_SOURCES += fts.c
+endif
 
 Include:
 "fts_.h"
diff --git a/modules/futimens b/modules/futimens
index ab1c62d2be..c081b6fe02 100644
--- a/modules/futimens
+++ b/modules/futimens
@@ -12,12 +12,14 @@ utimens         [test $HAVE_FUTIMENS = 0 || test $REPLACE_FUTIMENS = 1]
 
 configure.ac:
 gl_FUNC_FUTIMENS
-if test $HAVE_FUTIMENS = 0 || test $REPLACE_FUTIMENS = 1; then
-  AC_LIBOBJ([futimens])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_FUTIMENS],
+               [test $HAVE_FUTIMENS = 0 || test $REPLACE_FUTIMENS = 1])
 gl_SYS_STAT_MODULE_INDICATOR([futimens])
 
 Makefile.am:
+if GL_COND_OBJ_FUTIMENS
+lib_SOURCES += futimens.c
+endif
 
 Include:
 <sys/stat.h>
diff --git a/modules/fwritable b/modules/fwritable
index 669ebf7ff9..7c7933eaad 100644
--- a/modules/fwritable
+++ b/modules/fwritable
@@ -12,11 +12,12 @@ stdbool
 
 configure.ac:
 gl_FUNC_FWRITABLE
-if test $ac_cv_func___fwritable = no; then
-  AC_LIBOBJ([fwritable])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_FWRITABLE], [test $ac_cv_func___fwritable = no])
 
 Makefile.am:
+if GL_COND_OBJ_FWRITABLE
+lib_SOURCES += fwritable.c
+endif
 
 Include:
 "fwritable.h"
diff --git a/modules/fwriting b/modules/fwriting
index 522bdb332b..6040bc00d1 100644
--- a/modules/fwriting
+++ b/modules/fwriting
@@ -12,11 +12,12 @@ stdbool
 
 configure.ac:
 gl_FUNC_FWRITING
-if test $ac_cv_func___fwriting = no; then
-  AC_LIBOBJ([fwriting])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_FWRITING], [test $ac_cv_func___fwriting = no])
 
 Makefile.am:
+if GL_COND_OBJ_FWRITING
+lib_SOURCES += fwriting.c
+endif
 
 Include:
 "fwriting.h"
diff --git a/modules/getaddrinfo b/modules/getaddrinfo
index 490838a8af..5dadc9d20c 100644
--- a/modules/getaddrinfo
+++ b/modules/getaddrinfo
@@ -21,15 +21,19 @@ sockets         [test $HAVE_GETADDRINFO = 0 || test $REPLACE_GETADDRINFO = 1]
 
 configure.ac:
 gl_GETADDRINFO
-if test $HAVE_GETADDRINFO = 0 || test $REPLACE_GETADDRINFO = 1; then
-  AC_LIBOBJ([getaddrinfo])
-fi
-if test $HAVE_DECL_GAI_STRERROR = 0 || test $REPLACE_GAI_STRERROR = 1; then
-  AC_LIBOBJ([gai_strerror])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_GETADDRINFO],
+               [test $HAVE_GETADDRINFO = 0 || test $REPLACE_GETADDRINFO = 1])
+gl_CONDITIONAL([GL_COND_OBJ_GAI_STRERROR],
+               [test $HAVE_DECL_GAI_STRERROR = 0 || test $REPLACE_GAI_STRERROR = 1])
 gl_NETDB_MODULE_INDICATOR([getaddrinfo])
 
 Makefile.am:
+if GL_COND_OBJ_GETADDRINFO
+lib_SOURCES += getaddrinfo.c
+endif
+if GL_COND_OBJ_GAI_STRERROR
+lib_SOURCES += gai_strerror.c
+endif
 
 Include:
 <netdb.h>
diff --git a/modules/getcwd b/modules/getcwd
index 90299a1c7e..597d22ca0b 100644
--- a/modules/getcwd
+++ b/modules/getcwd
@@ -32,14 +32,17 @@ strdup-posix    [test $REPLACE_GETCWD = 1]
 
 configure.ac:
 gl_FUNC_GETCWD
-if test $REPLACE_GETCWD = 1; then
-  AC_LIBOBJ([getcwd])
+gl_CONDITIONAL([GL_COND_OBJ_GETCWD], [test $REPLACE_GETCWD = 1])
+AM_COND_IF([GL_COND_OBJ_GETCWD], [
   gl_PREREQ_GETCWD
-fi
+])
 gl_MODULE_INDICATOR([getcwd])
 gl_UNISTD_MODULE_INDICATOR([getcwd])
 
 Makefile.am:
+if GL_COND_OBJ_GETCWD
+lib_SOURCES += getcwd.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/getcwd-lgpl b/modules/getcwd-lgpl
index ff1385725c..ae11d286b4 100644
--- a/modules/getcwd-lgpl
+++ b/modules/getcwd-lgpl
@@ -12,12 +12,13 @@ strdup          [test $REPLACE_GETCWD = 1]
 
 configure.ac:
 gl_FUNC_GETCWD_LGPL
-if test $REPLACE_GETCWD = 1; then
-  AC_LIBOBJ([getcwd-lgpl])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_GETCWD_LGPL], [test $REPLACE_GETCWD = 1])
 gl_UNISTD_MODULE_INDICATOR([getcwd])
 
 Makefile.am:
+if GL_COND_OBJ_GETCWD_LGPL
+lib_SOURCES += getcwd-lgpl.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/getdelim b/modules/getdelim
index ee7116500c..793454fc8b 100644
--- a/modules/getdelim
+++ b/modules/getdelim
@@ -13,13 +13,17 @@ errno           [test $HAVE_GETDELIM = 0 || test $REPLACE_GETDELIM = 1]
 
 configure.ac:
 gl_FUNC_GETDELIM
-if test $HAVE_GETDELIM = 0 || test $REPLACE_GETDELIM = 1; then
-  AC_LIBOBJ([getdelim])
+gl_CONDITIONAL([GL_COND_OBJ_GETDELIM],
+               [test $HAVE_GETDELIM = 0 || test $REPLACE_GETDELIM = 1])
+AM_COND_IF([GL_COND_OBJ_GETDELIM], [
   gl_PREREQ_GETDELIM
-fi
+])
 gl_STDIO_MODULE_INDICATOR([getdelim])
 
 Makefile.am:
+if GL_COND_OBJ_GETDELIM
+lib_SOURCES += getdelim.c
+endif
 
 Include:
 <stdio.h>
diff --git a/modules/getdomainname b/modules/getdomainname
index 457de318c3..1e21c90658 100644
--- a/modules/getdomainname
+++ b/modules/getdomainname
@@ -13,13 +13,17 @@ sys_socket      [test $HAVE_DECL_GETDOMAINNAME = 0 || test $REPLACE_GETDOMAINNAM
 
 configure.ac:
 gl_FUNC_GETDOMAINNAME
-if test $HAVE_DECL_GETDOMAINNAME = 0 || test $REPLACE_GETDOMAINNAME = 1; then
-  AC_LIBOBJ([getdomainname])
+gl_CONDITIONAL([GL_COND_OBJ_GETDOMAINNAME],
+               [test $HAVE_DECL_GETDOMAINNAME = 0 || test $REPLACE_GETDOMAINNAME = 1])
+AM_COND_IF([GL_COND_OBJ_GETDOMAINNAME], [
   gl_PREREQ_GETDOMAINNAME
-fi
+])
 gl_UNISTD_MODULE_INDICATOR([getdomainname])
 
 Makefile.am:
+if GL_COND_OBJ_GETDOMAINNAME
+lib_SOURCES += getdomainname.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/getdtablesize b/modules/getdtablesize
index f33fcb510e..fa0392400b 100644
--- a/modules/getdtablesize
+++ b/modules/getdtablesize
@@ -12,13 +12,17 @@ msvc-inval      [test $HAVE_GETDTABLESIZE = 0]
 
 configure.ac:
 gl_FUNC_GETDTABLESIZE
-if test $HAVE_GETDTABLESIZE = 0 || test $REPLACE_GETDTABLESIZE = 1; then
-  AC_LIBOBJ([getdtablesize])
+gl_CONDITIONAL([GL_COND_OBJ_GETDTABLESIZE],
+               [test $HAVE_GETDTABLESIZE = 0 || test $REPLACE_GETDTABLESIZE = 1])
+AM_COND_IF([GL_COND_OBJ_GETDTABLESIZE], [
   gl_PREREQ_GETDTABLESIZE
-fi
+])
 gl_UNISTD_MODULE_INDICATOR([getdtablesize])
 
 Makefile.am:
+if GL_COND_OBJ_GETDTABLESIZE
+lib_SOURCES += getdtablesize.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/getentropy b/modules/getentropy
index 680aa4716b..0088b8b8e1 100644
--- a/modules/getentropy
+++ b/modules/getentropy
@@ -12,12 +12,13 @@ unistd
 
 configure.ac:
 gl_FUNC_GETENTROPY
-if test $HAVE_GETENTROPY = 0; then
-  AC_LIBOBJ([getentropy])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_GETENTROPY], [test $HAVE_GETENTROPY = 0])
 gl_UNISTD_MODULE_INDICATOR([getentropy])
 
 Makefile.am:
+if GL_COND_OBJ_GETENTROPY
+lib_SOURCES += getentropy.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/getgroups b/modules/getgroups
index 7625a535ad..58c607930f 100644
--- a/modules/getgroups
+++ b/modules/getgroups
@@ -13,12 +13,14 @@ stdint          [test $HAVE_GETGROUPS = 0 || test $REPLACE_GETGROUPS = 1]
 
 configure.ac:
 gl_FUNC_GETGROUPS
-if test $HAVE_GETGROUPS = 0 || test $REPLACE_GETGROUPS = 1; then
-  AC_LIBOBJ([getgroups])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_GETGROUPS],
+               [test $HAVE_GETGROUPS = 0 || test $REPLACE_GETGROUPS = 1])
 gl_UNISTD_MODULE_INDICATOR([getgroups])
 
 Makefile.am:
+if GL_COND_OBJ_GETGROUPS
+lib_SOURCES += getgroups.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/gethostname b/modules/gethostname
index b41dfad9a7..94151cd8b0 100644
--- a/modules/gethostname
+++ b/modules/gethostname
@@ -15,13 +15,16 @@ msvc-nothrow    [test $HAVE_GETHOSTNAME = 0]
 
 configure.ac:
 gl_FUNC_GETHOSTNAME
-if test $HAVE_GETHOSTNAME = 0; then
-  AC_LIBOBJ([gethostname])
+gl_CONDITIONAL([GL_COND_OBJ_GETHOSTNAME], [test $HAVE_GETHOSTNAME = 0])
+AM_COND_IF([GL_COND_OBJ_GETHOSTNAME], [
   gl_PREREQ_GETHOSTNAME
-fi
+])
 gl_UNISTD_MODULE_INDICATOR([gethostname])
 
 Makefile.am:
+if GL_COND_OBJ_GETHOSTNAME
+lib_SOURCES += gethostname.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/getline b/modules/getline
index 72e77abdcf..cde088e62e 100644
--- a/modules/getline
+++ b/modules/getline
@@ -12,13 +12,16 @@ getdelim        [test $REPLACE_GETLINE = 1]
 
 configure.ac:
 gl_FUNC_GETLINE
-if test $REPLACE_GETLINE = 1; then
-  AC_LIBOBJ([getline])
+gl_CONDITIONAL([GL_COND_OBJ_GETLINE], [test $REPLACE_GETLINE = 1])
+AM_COND_IF([GL_COND_OBJ_GETLINE], [
   gl_PREREQ_GETLINE
-fi
+])
 gl_STDIO_MODULE_INDICATOR([getline])
 
 Makefile.am:
+if GL_COND_OBJ_GETLINE
+lib_SOURCES += getline.c
+endif
 
 Include:
 <stdio.h>
diff --git a/modules/getloadavg b/modules/getloadavg
index 21955b782f..9a5553ebba 100644
--- a/modules/getloadavg
+++ b/modules/getloadavg
@@ -15,13 +15,16 @@ stdlib    [test $HAVE_GETLOADAVG = 0]
 configure.ac:
 AC_REQUIRE([AC_CANONICAL_HOST])
 gl_GETLOADAVG
-if test $HAVE_GETLOADAVG = 0; then
-  AC_LIBOBJ([getloadavg])
+gl_CONDITIONAL([GL_COND_OBJ_GETLOADAVG], [test $HAVE_GETLOADAVG = 0])
+AM_COND_IF([GL_COND_OBJ_GETLOADAVG], [
   gl_PREREQ_GETLOADAVG
-fi
+])
 gl_STDLIB_MODULE_INDICATOR([getloadavg])
 
 Makefile.am:
+if GL_COND_OBJ_GETLOADAVG
+lib_SOURCES += getloadavg.c
+endif
 
 Include:
 <stdlib.h>
diff --git a/modules/getlogin b/modules/getlogin
index 1348319b70..0a88c92e0e 100644
--- a/modules/getlogin
+++ b/modules/getlogin
@@ -10,13 +10,14 @@ unistd
 
 configure.ac:
 gl_FUNC_GETLOGIN
-if test $HAVE_GETLOGIN = 0; then
-  AC_LIBOBJ([getlogin])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_GETLOGIN], [test $HAVE_GETLOGIN = 0])
 gl_UNISTD_MODULE_INDICATOR([getlogin])
 AC_REQUIRE([gl_LIB_GETLOGIN])
 
 Makefile.am:
+if GL_COND_OBJ_GETLOGIN
+lib_SOURCES += getlogin.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/getlogin_r b/modules/getlogin_r
index befc365544..b5f356a123 100644
--- a/modules/getlogin_r
+++ b/modules/getlogin_r
@@ -14,14 +14,18 @@ memchr          [test $HAVE_GETLOGIN_R = 0 || test $REPLACE_GETLOGIN_R = 1]
 
 configure.ac:
 gl_FUNC_GETLOGIN_R
-if test $HAVE_GETLOGIN_R = 0 || test $REPLACE_GETLOGIN_R = 1; then
-  AC_LIBOBJ([getlogin_r])
+gl_CONDITIONAL([GL_COND_OBJ_GETLOGIN_R],
+               [test $HAVE_GETLOGIN_R = 0 || test $REPLACE_GETLOGIN_R = 1])
+AM_COND_IF([GL_COND_OBJ_GETLOGIN_R], [
   gl_PREREQ_GETLOGIN_R
-fi
+])
 gl_UNISTD_MODULE_INDICATOR([getlogin_r])
 AC_REQUIRE([gl_LIB_GETLOGIN])
 
 Makefile.am:
+if GL_COND_OBJ_GETLOGIN_R
+lib_SOURCES += getlogin_r.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/getopt-posix b/modules/getopt-posix
index fe9da36f28..6305e83c8a 100644
--- a/modules/getopt-posix
+++ b/modules/getopt-posix
@@ -26,13 +26,12 @@ gl_FUNC_GETOPT_POSIX
 gl_CONDITIONAL_HEADER([getopt.h])
 gl_CONDITIONAL_HEADER([getopt-cdefs.h])
 AC_PROG_MKDIR_P
-if test $REPLACE_GETOPT = 1; then
-  AC_LIBOBJ([getopt])
-  AC_LIBOBJ([getopt1])
+gl_CONDITIONAL([GL_COND_OBJ_GETOPT], [test $REPLACE_GETOPT = 1])
+AM_COND_IF([GL_COND_OBJ_GETOPT], [
   dnl Define the substituted variable GNULIB_UNISTD_H_GETOPT to 1.
   gl_UNISTD_H_REQUIRE_DEFAULTS
   gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNISTD_H_GETOPT], [1])
-fi
+])
 gl_UNISTD_MODULE_INDICATOR([getopt-posix])
 
 Makefile.am:
@@ -71,6 +70,10 @@ endif
 
 MOSTLYCLEANFILES += getopt.h getopt.h-t getopt-cdefs.h getopt-cdefs.h-t
 
+if GL_COND_OBJ_GETOPT
+lib_SOURCES += getopt.c getopt1.c
+endif
+
 Include:
 <unistd.h>
 
diff --git a/modules/getpagesize b/modules/getpagesize
index 015fbe6bdf..7b38fff93b 100644
--- a/modules/getpagesize
+++ b/modules/getpagesize
@@ -10,12 +10,13 @@ unistd
 
 configure.ac:
 gl_FUNC_GETPAGESIZE
-if test $REPLACE_GETPAGESIZE = 1; then
-  AC_LIBOBJ([getpagesize])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_GETPAGESIZE], [test $REPLACE_GETPAGESIZE = 1])
 gl_UNISTD_MODULE_INDICATOR([getpagesize])
 
 Makefile.am:
+if GL_COND_OBJ_GETPAGESIZE
+lib_SOURCES += getpagesize.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/getpeername b/modules/getpeername
index c03e3244fa..c0d7c997a2 100644
--- a/modules/getpeername
+++ b/modules/getpeername
@@ -15,12 +15,14 @@ msvc-nothrow    [test "$ac_cv_header_winsock2_h" = yes]
 
 configure.ac:
 AC_REQUIRE([gl_SYS_SOCKET_H])
-if test "$ac_cv_header_winsock2_h" = yes; then
-  AC_LIBOBJ([getpeername])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_GETPEERNAME],
+               [test "$ac_cv_header_winsock2_h" = yes])
 gl_SYS_SOCKET_MODULE_INDICATOR([getpeername])
 
 Makefile.am:
+if GL_COND_OBJ_GETPEERNAME
+lib_SOURCES += getpeername.c
+endif
 
 Include:
 <sys/socket.h>
diff --git a/modules/getrandom b/modules/getrandom
index 8add3915d5..cb4317e9f7 100644
--- a/modules/getrandom
+++ b/modules/getrandom
@@ -14,12 +14,14 @@ open                [case $host_os in mingw*) false;; *) test $HAVE_GETRANDOM =
 configure.ac:
 AC_REQUIRE([AC_CANONICAL_HOST])
 gl_FUNC_GETRANDOM
-if test $HAVE_GETRANDOM = 0 || test $REPLACE_GETRANDOM = 1; then
-  AC_LIBOBJ([getrandom])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_GETRANDOM],
+               [test $HAVE_GETRANDOM = 0 || test $REPLACE_GETRANDOM = 1])
 gl_SYS_RANDOM_MODULE_INDICATOR([getrandom])
 
 Makefile.am:
+if GL_COND_OBJ_GETRANDOM
+lib_SOURCES += getrandom.c
+endif
 
 Include:
 <sys/random.h>
diff --git a/modules/getrusage b/modules/getrusage
index 4f58f9663d..512fb1c419 100644
--- a/modules/getrusage
+++ b/modules/getrusage
@@ -11,12 +11,13 @@ stdint          [test $HAVE_GETRUSAGE = 0]
 
 configure.ac:
 gl_FUNC_GETRUSAGE
-if test $HAVE_GETRUSAGE = 0; then
-  AC_LIBOBJ([getrusage])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_GETRUSAGE], [test $HAVE_GETRUSAGE = 0])
 gl_SYS_RESOURCE_MODULE_INDICATOR([getrusage])
 
 Makefile.am:
+if GL_COND_OBJ_GETRUSAGE
+lib_SOURCES += getrusage.c
+endif
 
 Include:
 <sys/resource.h>
diff --git a/modules/getsockname b/modules/getsockname
index 7bb278be8b..8a44ebaebd 100644
--- a/modules/getsockname
+++ b/modules/getsockname
@@ -15,12 +15,14 @@ msvc-nothrow    [test "$ac_cv_header_winsock2_h" = yes]
 
 configure.ac:
 AC_REQUIRE([gl_SYS_SOCKET_H])
-if test "$ac_cv_header_winsock2_h" = yes; then
-  AC_LIBOBJ([getsockname])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_GETSOCKNAME],
+               [test "$ac_cv_header_winsock2_h" = yes])
 gl_SYS_SOCKET_MODULE_INDICATOR([getsockname])
 
 Makefile.am:
+if GL_COND_OBJ_GETSOCKNAME
+lib_SOURCES += getsockname.c
+endif
 
 Include:
 <sys/socket.h>
diff --git a/modules/getsockopt b/modules/getsockopt
index d5d7310812..7749995a60 100644
--- a/modules/getsockopt
+++ b/modules/getsockopt
@@ -15,12 +15,14 @@ msvc-nothrow    [test "$ac_cv_header_winsock2_h" = yes]
 
 configure.ac:
 AC_REQUIRE([gl_SYS_SOCKET_H])
-if test "$ac_cv_header_winsock2_h" = yes; then
-  AC_LIBOBJ([getsockopt])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_GETSOCKOPT],
+               [test "$ac_cv_header_winsock2_h" = yes])
 gl_SYS_SOCKET_MODULE_INDICATOR([getsockopt])
 
 Makefile.am:
+if GL_COND_OBJ_GETSOCKOPT
+lib_SOURCES += getsockopt.c
+endif
 
 Include:
 <sys/socket.h>
diff --git a/modules/getsubopt b/modules/getsubopt
index a544ca3ccb..0b0d23d56d 100644
--- a/modules/getsubopt
+++ b/modules/getsubopt
@@ -13,13 +13,16 @@ memchr          [test $HAVE_GETSUBOPT = 0]
 
 configure.ac:
 gl_FUNC_GETSUBOPT
-if test $HAVE_GETSUBOPT = 0; then
-  AC_LIBOBJ([getsubopt])
+gl_CONDITIONAL([GL_COND_OBJ_GETSUBOPT], [test $HAVE_GETSUBOPT = 0])
+AM_COND_IF([GL_COND_OBJ_GETSUBOPT], [
   gl_PREREQ_GETSUBOPT
-fi
+])
 gl_STDLIB_MODULE_INDICATOR([getsubopt])
 
 Makefile.am:
+if GL_COND_OBJ_GETSUBOPT
+lib_SOURCES += getsubopt.c
+endif
 
 Include:
 <stdlib.h>
diff --git a/modules/gettimeofday b/modules/gettimeofday
index b4bdcc37c7..56ad938755 100644
--- a/modules/gettimeofday
+++ b/modules/gettimeofday
@@ -10,13 +10,17 @@ sys_time
 
 configure.ac:
 gl_FUNC_GETTIMEOFDAY
-if test $HAVE_GETTIMEOFDAY = 0 || test $REPLACE_GETTIMEOFDAY = 1; then
-  AC_LIBOBJ([gettimeofday])
+gl_CONDITIONAL([GL_COND_OBJ_GETTIMEOFDAY],
+               [test $HAVE_GETTIMEOFDAY = 0 || test $REPLACE_GETTIMEOFDAY = 1])
+AM_COND_IF([GL_COND_OBJ_GETTIMEOFDAY], [
   gl_PREREQ_GETTIMEOFDAY
-fi
+])
 gl_SYS_TIME_MODULE_INDICATOR([gettimeofday])
 
 Makefile.am:
+if GL_COND_OBJ_GETTIMEOFDAY
+lib_SOURCES += gettimeofday.c
+endif
 
 Include:
 <sys/time.h>
diff --git a/modules/getumask b/modules/getumask
index 0f21808711..5f70901a6d 100644
--- a/modules/getumask
+++ b/modules/getumask
@@ -15,13 +15,16 @@ tempname        [test $HAVE_GETUMASK = 0]
 
 configure.ac:
 gl_FUNC_GETUMASK
-if test $HAVE_GETUMASK = 0; then
-  AC_LIBOBJ([getumask])
+gl_CONDITIONAL([GL_COND_OBJ_GETUMASK], [test $HAVE_GETUMASK = 0])
+AM_COND_IF([GL_COND_OBJ_GETUMASK], [
   gl_PREREQ_GETUMASK
-fi
+])
 gl_SYS_STAT_MODULE_INDICATOR([getumask])
 
 Makefile.am:
+if GL_COND_OBJ_GETUMASK
+lib_SOURCES += getumask.c
+endif
 
 Include:
 <sys/stat.h>
diff --git a/modules/getusershell b/modules/getusershell
index ed2f30f3c5..19929c9b2c 100644
--- a/modules/getusershell
+++ b/modules/getusershell
@@ -14,12 +14,13 @@ xalloc               [test $HAVE_GETUSERSHELL = 0]
 
 configure.ac:
 gl_FUNC_GETUSERSHELL
-if test $HAVE_GETUSERSHELL = 0; then
-  AC_LIBOBJ([getusershell])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_GETUSERSHELL], [test $HAVE_GETUSERSHELL = 0])
 gl_UNISTD_MODULE_INDICATOR([getusershell])
 
 Makefile.am:
+if GL_COND_OBJ_GETUSERSHELL
+lib_SOURCES += getusershell.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/glob b/modules/glob
index 7e66b47844..ba270e8427 100644
--- a/modules/glob
+++ b/modules/glob
@@ -37,17 +37,22 @@ configure.ac:
 gl_GLOB
 dnl Because of gl_REPLACE_GLOB_H:
 gl_CONDITIONAL_HEADER([glob.h])
-if test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1; then
-  AC_LIBOBJ([glob])
-  AC_LIBOBJ([globfree])
+gl_CONDITIONAL([GL_COND_OBJ_GLOB],
+               [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1])
+AM_COND_IF([GL_COND_OBJ_GLOB], [
   gl_PREREQ_GLOB
-fi
-if test $HAVE_GLOB_PATTERN_P = 0 || test $REPLACE_GLOB_PATTERN_P = 1; then
-  AC_LIBOBJ([glob_pattern_p])
-fi
+])
+gl_CONDITIONAL([GL_COND_OBJ_GLOB_PATTERN_P],
+               [test $HAVE_GLOB_PATTERN_P = 0 || test $REPLACE_GLOB_PATTERN_P = 1])
 gl_GLOB_MODULE_INDICATOR([glob])
 
 Makefile.am:
+if GL_COND_OBJ_GLOB
+lib_SOURCES += glob.c globfree.c
+endif
+if GL_COND_OBJ_GLOB_PATTERN_P
+lib_SOURCES += glob_pattern_p.c
+endif
 
 Include:
 <glob.h>
diff --git a/modules/grantpt b/modules/grantpt
index 38675b6fb5..db09688b96 100644
--- a/modules/grantpt
+++ b/modules/grantpt
@@ -15,13 +15,16 @@ configmake      [test $HAVE_GRANTPT = 0]
 
 configure.ac:
 gl_FUNC_GRANTPT
-if test $HAVE_GRANTPT = 0; then
-  AC_LIBOBJ([grantpt])
+gl_CONDITIONAL([GL_COND_OBJ_GRANTPT], [test $HAVE_GRANTPT = 0])
+AM_COND_IF([GL_COND_OBJ_GRANTPT], [
   gl_PREREQ_GRANTPT
-fi
+])
 gl_STDLIB_MODULE_INDICATOR([grantpt])
 
 Makefile.am:
+if GL_COND_OBJ_GRANTPT
+lib_SOURCES += grantpt.c
+endif
 
 Include:
 <stdlib.h>
diff --git a/modules/group-member b/modules/group-member
index a224d98880..c08e786e0a 100644
--- a/modules/group-member
+++ b/modules/group-member
@@ -14,13 +14,16 @@ realloc-gnu      [test $HAVE_GROUP_MEMBER = 0]
 
 configure.ac:
 gl_FUNC_GROUP_MEMBER
-if test $HAVE_GROUP_MEMBER = 0; then
-  AC_LIBOBJ([group-member])
+gl_CONDITIONAL([GL_COND_OBJ_GROUP_MEMBER], [test $HAVE_GROUP_MEMBER = 0])
+AM_COND_IF([GL_COND_OBJ_GROUP_MEMBER], [
   gl_PREREQ_GROUP_MEMBER
-fi
+])
 gl_UNISTD_MODULE_INDICATOR([group-member])
 
 Makefile.am:
+if GL_COND_OBJ_GROUP_MEMBER
+lib_SOURCES += group-member.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/hypot b/modules/hypot
index c67b7af089..36ee7bbdef 100644
--- a/modules/hypot
+++ b/modules/hypot
@@ -18,12 +18,13 @@ isinf           [test $REPLACE_HYPOT = 1]
 
 configure.ac:
 gl_FUNC_HYPOT
-if test $REPLACE_HYPOT = 1; then
-  AC_LIBOBJ([hypot])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_HYPOT], [test $REPLACE_HYPOT = 1])
 gl_MATH_MODULE_INDICATOR([hypot])
 
 Makefile.am:
+if GL_COND_OBJ_HYPOT
+lib_SOURCES += hypot.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/hypotf b/modules/hypotf
index 8cc3382c7d..e5e34c45fc 100644
--- a/modules/hypotf
+++ b/modules/hypotf
@@ -13,12 +13,14 @@ hypot           [test $HAVE_HYPOTF = 0 || test $REPLACE_HYPOTF = 1]
 
 configure.ac:
 gl_FUNC_HYPOTF
-if test $HAVE_HYPOTF = 0 || test $REPLACE_HYPOTF = 1; then
-  AC_LIBOBJ([hypotf])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_HYPOTF],
+               [test $HAVE_HYPOTF = 0 || test $REPLACE_HYPOTF = 1])
 gl_MATH_MODULE_INDICATOR([hypotf])
 
 Makefile.am:
+if GL_COND_OBJ_HYPOTF
+lib_SOURCES += hypotf.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/hypotl b/modules/hypotl
index f2549fe6ce..ff9b7e6ff9 100644
--- a/modules/hypotl
+++ b/modules/hypotl
@@ -19,12 +19,14 @@ isinf           [{ test $HAVE_HYPOTL = 0 || test $REPLACE_HYPOTL = 1; } && test
 
 configure.ac:
 gl_FUNC_HYPOTL
-if test $HAVE_HYPOTL = 0 || test $REPLACE_HYPOTL = 1; then
-  AC_LIBOBJ([hypotl])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_HYPOTL],
+               [test $HAVE_HYPOTL = 0 || test $REPLACE_HYPOTL = 1])
 gl_MATH_MODULE_INDICATOR([hypotl])
 
 Makefile.am:
+if GL_COND_OBJ_HYPOTL
+lib_SOURCES += hypotl.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/iconv_open b/modules/iconv_open
index e7e7a762a8..8aada83ef1 100644
--- a/modules/iconv_open
+++ b/modules/iconv_open
@@ -27,15 +27,17 @@ configure.ac:
 gl_FUNC_ICONV_OPEN
 dnl Because of gl_REPLACE_ICONV_H:
 gl_CONDITIONAL_HEADER([iconv.h])
-if test $REPLACE_ICONV_OPEN = 1; then
-  AC_LIBOBJ([iconv_open])
-fi
-if test $REPLACE_ICONV = 1; then
-  AC_LIBOBJ([iconv])
-  AC_LIBOBJ([iconv_close])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_ICONV_OPEN], [test $REPLACE_ICONV_OPEN = 1])
+gl_CONDITIONAL([GL_COND_OBJ_ICONV], [test $REPLACE_ICONV = 1])
 
 Makefile.am:
+if GL_COND_OBJ_ICONV_OPEN
+lib_SOURCES += iconv_open.c
+endif
+if GL_COND_OBJ_ICONV
+lib_SOURCES += iconv.c iconv_close.c
+endif
+
 $(srcdir)/iconv_open-aix.h: $(srcdir)/iconv_open-aix.gperf
 	$(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-aix.gperf > $(srcdir)/iconv_open-aix.h-t && \
 	mv $(srcdir)/iconv_open-aix.h-t $(srcdir)/iconv_open-aix.h
diff --git a/modules/ilogb b/modules/ilogb
index 1f69a8e293..2e2b3eec42 100644
--- a/modules/ilogb
+++ b/modules/ilogb
@@ -14,12 +14,14 @@ isnand          [test $HAVE_ILOGB = 0 || test $REPLACE_ILOGB = 1]
 
 configure.ac:
 gl_FUNC_ILOGB
-if test $HAVE_ILOGB = 0 || test $REPLACE_ILOGB = 1; then
-  AC_LIBOBJ([ilogb])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_ILOGB],
+               [test $HAVE_ILOGB = 0 || test $REPLACE_ILOGB = 1])
 gl_MATH_MODULE_INDICATOR([ilogb])
 
 Makefile.am:
+if GL_COND_OBJ_ILOGB
+lib_SOURCES += ilogb.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/ilogbf b/modules/ilogbf
index 9d6cb4872c..8b9a4094ee 100644
--- a/modules/ilogbf
+++ b/modules/ilogbf
@@ -16,12 +16,14 @@ isnanf          [test $HAVE_ILOGBF = 0 || test $REPLACE_ILOGBF = 1]
 
 configure.ac:
 gl_FUNC_ILOGBF
-if test $HAVE_ILOGBF = 0 || test $REPLACE_ILOGBF = 1; then
-  AC_LIBOBJ([ilogbf])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_ILOGBF],
+               [test $HAVE_ILOGBF = 0 || test $REPLACE_ILOGBF = 1])
 gl_MATH_MODULE_INDICATOR([ilogbf])
 
 Makefile.am:
+if GL_COND_OBJ_ILOGBF
+lib_SOURCES += ilogbf.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/ilogbl b/modules/ilogbl
index 3d321aaeb5..cf52a665a2 100644
--- a/modules/ilogbl
+++ b/modules/ilogbl
@@ -17,12 +17,14 @@ isnanl          [{ test $HAVE_ILOGBL = 0 || test $REPLACE_ILOGBL = 1; } && test
 
 configure.ac:
 gl_FUNC_ILOGBL
-if test $HAVE_ILOGBL = 0 || test $REPLACE_ILOGBL = 1; then
-  AC_LIBOBJ([ilogbl])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_ILOGBL],
+               [test $HAVE_ILOGBL = 0 || test $REPLACE_ILOGBL = 1])
 gl_MATH_MODULE_INDICATOR([ilogbl])
 
 Makefile.am:
+if GL_COND_OBJ_ILOGBL
+lib_SOURCES += ilogbl.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/imaxabs b/modules/imaxabs
index 68569293f2..70bb9cd9c0 100644
--- a/modules/imaxabs
+++ b/modules/imaxabs
@@ -10,13 +10,16 @@ inttypes-incomplete
 
 configure.ac:
 gl_FUNC_IMAXABS
-if test $ac_cv_func_imaxabs = no; then
-  AC_LIBOBJ([imaxabs])
+gl_CONDITIONAL([GL_COND_OBJ_IMAXABS], [test $ac_cv_func_imaxabs = no])
+AM_COND_IF([GL_COND_OBJ_IMAXABS], [
   gl_PREREQ_IMAXABS
-fi
+])
 gl_INTTYPES_MODULE_INDICATOR([imaxabs])
 
 Makefile.am:
+if GL_COND_OBJ_IMAXABS
+lib_SOURCES += imaxabs.c
+endif
 
 Include:
 <inttypes.h>
diff --git a/modules/imaxdiv b/modules/imaxdiv
index 1a2af058c6..192a5e048d 100644
--- a/modules/imaxdiv
+++ b/modules/imaxdiv
@@ -10,13 +10,16 @@ inttypes-incomplete
 
 configure.ac:
 gl_FUNC_IMAXDIV
-if test $ac_cv_func_imaxdiv = no; then
-  AC_LIBOBJ([imaxdiv])
+gl_CONDITIONAL([GL_COND_OBJ_IMAXDIV], [test $ac_cv_func_imaxdiv = no])
+AM_COND_IF([GL_COND_OBJ_IMAXDIV], [
   gl_PREREQ_IMAXDIV
-fi
+])
 gl_INTTYPES_MODULE_INDICATOR([imaxdiv])
 
 Makefile.am:
+if GL_COND_OBJ_IMAXDIV
+lib_SOURCES += imaxdiv.c
+endif
 
 Include:
 <inttypes.h>
diff --git a/modules/inet_ntop b/modules/inet_ntop
index 275aa3ced2..0c552d90e0 100644
--- a/modules/inet_ntop
+++ b/modules/inet_ntop
@@ -15,13 +15,17 @@ netinet_in      [test $HAVE_INET_NTOP = 0 || test $REPLACE_INET_NTOP = 1]
 
 configure.ac:
 gl_FUNC_INET_NTOP
-if test $HAVE_INET_NTOP = 0 || test $REPLACE_INET_NTOP = 1; then
-  AC_LIBOBJ([inet_ntop])
+gl_CONDITIONAL([GL_COND_OBJ_INET_NTOP],
+               [test $HAVE_INET_NTOP = 0 || test $REPLACE_INET_NTOP = 1])
+AM_COND_IF([GL_COND_OBJ_INET_NTOP], [
   gl_PREREQ_INET_NTOP
-fi
+])
 gl_ARPA_INET_MODULE_INDICATOR([inet_ntop])
 
 Makefile.am:
+if GL_COND_OBJ_INET_NTOP
+lib_SOURCES += inet_ntop.c
+endif
 
 License:
 LGPLv2+
diff --git a/modules/inet_pton b/modules/inet_pton
index d1b941f4d8..237f947eb1 100644
--- a/modules/inet_pton
+++ b/modules/inet_pton
@@ -15,13 +15,17 @@ netinet_in      [test $HAVE_INET_PTON = 0 || test $REPLACE_INET_PTON = 1]
 
 configure.ac:
 gl_FUNC_INET_PTON
-if test $HAVE_INET_PTON = 0 || test $REPLACE_INET_PTON = 1; then
-  AC_LIBOBJ([inet_pton])
+gl_CONDITIONAL([GL_COND_OBJ_INET_PTON],
+               [test $HAVE_INET_PTON = 0 || test $REPLACE_INET_PTON = 1])
+AM_COND_IF([GL_COND_OBJ_INET_PTON], [
   gl_PREREQ_INET_PTON
-fi
+])
 gl_ARPA_INET_MODULE_INDICATOR([inet_pton])
 
 Makefile.am:
+if GL_COND_OBJ_INET_PTON
+lib_SOURCES += inet_pton.c
+endif
 
 License:
 LGPLv2+
diff --git a/modules/ioctl b/modules/ioctl
index 31fcf2bfde..a862891bc6 100644
--- a/modules/ioctl
+++ b/modules/ioctl
@@ -15,12 +15,14 @@ msvc-nothrow    [test $HAVE_IOCTL = 0 || test $REPLACE_IOCTL = 1]
 
 configure.ac:
 gl_FUNC_IOCTL
-if test $HAVE_IOCTL = 0 || test $REPLACE_IOCTL = 1; then
-  AC_LIBOBJ([ioctl])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_IOCTL],
+               [test $HAVE_IOCTL = 0 || test $REPLACE_IOCTL = 1])
 gl_SYS_IOCTL_MODULE_INDICATOR([ioctl])
 
 Makefile.am:
+if GL_COND_OBJ_IOCTL
+lib_SOURCES += ioctl.c
+endif
 
 Include:
 <sys/ioctl.h>
diff --git a/modules/isapipe b/modules/isapipe
index 25a87b19de..b065843f47 100644
--- a/modules/isapipe
+++ b/modules/isapipe
@@ -15,12 +15,15 @@ fstat           [test $HAVE_ISAPIPE = 0]
 
 configure.ac:
 gl_ISAPIPE
-if test $HAVE_ISAPIPE = 0; then
-  AC_LIBOBJ([isapipe])
+gl_CONDITIONAL([GL_COND_OBJ_ISAPIPE], [test $HAVE_ISAPIPE = 0])
+AM_COND_IF([GL_COND_OBJ_ISAPIPE], [
   gl_PREREQ_ISAPIPE
-fi
+])
 
 Makefile.am:
+if GL_COND_OBJ_ISAPIPE
+lib_SOURCES += isapipe.c
+endif
 
 Include:
 "isapipe.h"
diff --git a/modules/isatty b/modules/isatty
index fc5d5c3ddb..dce8551c9f 100644
--- a/modules/isatty
+++ b/modules/isatty
@@ -12,13 +12,16 @@ msvc-nothrow    [test $REPLACE_ISATTY = 1]
 
 configure.ac:
 gl_FUNC_ISATTY
-if test $REPLACE_ISATTY = 1; then
-  AC_LIBOBJ([isatty])
+gl_CONDITIONAL([GL_COND_OBJ_ISATTY], [test $REPLACE_ISATTY = 1])
+AM_COND_IF([GL_COND_OBJ_ISATTY], [
   gl_PREREQ_ISATTY
-fi
+])
 gl_UNISTD_MODULE_INDICATOR([isatty])
 
 Makefile.am:
+if GL_COND_OBJ_ISATTY
+lib_SOURCES += isatty.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/isblank b/modules/isblank
index ff4831b16e..ffbb16568a 100644
--- a/modules/isblank
+++ b/modules/isblank
@@ -11,13 +11,14 @@ ctype
 
 configure.ac:
 gl_FUNC_ISBLANK
-if test $HAVE_ISBLANK = 0; then
-  AC_LIBOBJ([isblank])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_ISBLANK], [test $HAVE_ISBLANK = 0])
 gl_MODULE_INDICATOR([isblank])
 gl_CTYPE_MODULE_INDICATOR([isblank])
 
 Makefile.am:
+if GL_COND_OBJ_ISBLANK
+lib_SOURCES += isblank.c
+endif
 
 Include:
 <ctype.h>
diff --git a/modules/isfinite b/modules/isfinite
index 3ef560930c..9933109cb0 100644
--- a/modules/isfinite
+++ b/modules/isfinite
@@ -15,12 +15,13 @@ isnanl-nolibm   [test $REPLACE_ISFINITE = 1]
 
 configure.ac:
 gl_ISFINITE
-if test $REPLACE_ISFINITE = 1; then
-  AC_LIBOBJ([isfinite])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_ISFINITE], [test $REPLACE_ISFINITE = 1])
 gl_MATH_MODULE_INDICATOR([isfinite])
 
 Makefile.am:
+if GL_COND_OBJ_ISFINITE
+lib_SOURCES += isfinite.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/isinf b/modules/isinf
index e7f0bf966e..7097ac1edb 100644
--- a/modules/isinf
+++ b/modules/isinf
@@ -13,12 +13,13 @@ float           [test $REPLACE_ISINF = 1]
 
 configure.ac:
 gl_ISINF
-if test $REPLACE_ISINF = 1; then
-  AC_LIBOBJ([isinf])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_ISINF], [test $REPLACE_ISINF = 1])
 gl_MATH_MODULE_INDICATOR([isinf])
 
 Makefile.am:
+if GL_COND_OBJ_ISINF
+lib_SOURCES += isinf.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/iswblank b/modules/iswblank
index 6e9002c8fb..ba020dad7a 100644
--- a/modules/iswblank
+++ b/modules/iswblank
@@ -11,16 +11,14 @@ extensions
 
 configure.ac:
 gl_FUNC_ISWBLANK
-if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then
-  :
-else
-  if test $HAVE_ISWBLANK = 0 || test $REPLACE_ISWBLANK = 1; then
-    AC_LIBOBJ([iswblank])
-  fi
-fi
+gl_CONDITIONAL([GL_COND_OBJ_ISWBLANK],
+               [! { test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; } && { test $HAVE_ISWBLANK = 0 || test $REPLACE_ISWBLANK = 1; }])
 gl_WCTYPE_MODULE_INDICATOR([iswblank])
 
 Makefile.am:
+if GL_COND_OBJ_ISWBLANK
+lib_SOURCES += iswblank.c
+endif
 
 Include:
 <wctype.h>
diff --git a/modules/iswctype b/modules/iswctype
index 8a8343d129..ea8755bc1a 100644
--- a/modules/iswctype
+++ b/modules/iswctype
@@ -17,12 +17,14 @@ wctype-h
 
 configure.ac:
 gl_FUNC_ISWCTYPE
-if test $HAVE_WCTYPE_T = 0 || test $GNULIBHEADERS_OVERRIDE_WINT_T = 1; then
-  AC_LIBOBJ([iswctype])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_ISWCTYPE],
+               [test $HAVE_WCTYPE_T = 0 || test $GNULIBHEADERS_OVERRIDE_WINT_T = 1])
 gl_WCTYPE_MODULE_INDICATOR([iswctype])
 
 Makefile.am:
+if GL_COND_OBJ_ISWCTYPE
+lib_SOURCES += iswctype.c
+endif
 
 Include:
 <wctype.h>
diff --git a/modules/iswdigit b/modules/iswdigit
index 2e62122cdd..afa30b8de5 100644
--- a/modules/iswdigit
+++ b/modules/iswdigit
@@ -14,16 +14,14 @@ wctype-h
 
 configure.ac:
 gl_FUNC_ISWDIGIT
-if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then
-  :
-else
-  if test $REPLACE_ISWDIGIT = 1; then
-    AC_LIBOBJ([iswdigit])
-  fi
-fi
+gl_CONDITIONAL([GL_COND_OBJ_ISWDIGIT],
+               [! { test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; } && test $REPLACE_ISWDIGIT = 1])
 gl_WCTYPE_MODULE_INDICATOR([iswdigit])
 
 Makefile.am:
+if GL_COND_OBJ_ISWDIGIT
+lib_SOURCES += iswdigit.c
+endif
 
 Include:
 <wctype.h>
diff --git a/modules/iswxdigit b/modules/iswxdigit
index b25b31d007..9261524c6e 100644
--- a/modules/iswxdigit
+++ b/modules/iswxdigit
@@ -14,16 +14,14 @@ wctype-h
 
 configure.ac:
 gl_FUNC_ISWXDIGIT
-if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then
-  :
-else
-  if test $REPLACE_ISWXDIGIT = 1; then
-    AC_LIBOBJ([iswxdigit])
-  fi
-fi
+gl_CONDITIONAL([GL_COND_OBJ_ISWXDIGIT],
+               [! { test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; } && test $REPLACE_ISWXDIGIT = 1])
 gl_WCTYPE_MODULE_INDICATOR([iswxdigit])
 
 Makefile.am:
+if GL_COND_OBJ_ISWXDIGIT
+lib_SOURCES += iswxdigit.c
+endif
 
 Include:
 <wctype.h>
diff --git a/modules/lchmod b/modules/lchmod
index dd887542f1..cce1500af7 100644
--- a/modules/lchmod
+++ b/modules/lchmod
@@ -17,13 +17,16 @@ unistd        [test $HAVE_LCHMOD = 0]
 
 configure.ac:
 gl_FUNC_LCHMOD
-if test $HAVE_LCHMOD = 0; then
-  AC_LIBOBJ([lchmod])
+gl_CONDITIONAL([GL_COND_OBJ_LCHMOD], [test $HAVE_LCHMOD = 0])
+AM_COND_IF([GL_COND_OBJ_LCHMOD], [
   gl_PREREQ_LCHMOD
-fi
+])
 gl_SYS_STAT_MODULE_INDICATOR([lchmod])
 
 Makefile.am:
+if GL_COND_OBJ_LCHMOD
+lib_SOURCES += lchmod.c
+endif
 
 Include:
 <sys/stat.h>
diff --git a/modules/lchown b/modules/lchown
index 1ddecca4c7..335d191f9f 100644
--- a/modules/lchown
+++ b/modules/lchown
@@ -15,12 +15,14 @@ sys_stat        [test $HAVE_LCHOWN = 0 || test $REPLACE_LCHOWN = 1]
 
 configure.ac:
 gl_FUNC_LCHOWN
-if test $HAVE_LCHOWN = 0 || test $REPLACE_LCHOWN = 1; then
-  AC_LIBOBJ([lchown])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_LCHOWN],
+               [test $HAVE_LCHOWN = 0 || test $REPLACE_LCHOWN = 1])
 gl_UNISTD_MODULE_INDICATOR([lchown])
 
 Makefile.am:
+if GL_COND_OBJ_LCHOWN
+lib_SOURCES += lchown.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/ldexpf b/modules/ldexpf
index 1a99a875d0..559e5e5e58 100644
--- a/modules/ldexpf
+++ b/modules/ldexpf
@@ -13,12 +13,13 @@ ldexp           [test $HAVE_LDEXPF = 0]
 
 configure.ac:
 gl_FUNC_LDEXPF
-if test $HAVE_LDEXPF = 0; then
-  AC_LIBOBJ([ldexpf])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_LDEXPF], [test $HAVE_LDEXPF = 0])
 gl_MATH_MODULE_INDICATOR([ldexpf])
 
 Makefile.am:
+if GL_COND_OBJ_LDEXPF
+lib_SOURCES += ldexpf.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/ldexpl b/modules/ldexpl
index 61a82c2f66..09104a6543 100644
--- a/modules/ldexpl
+++ b/modules/ldexpl
@@ -14,12 +14,14 @@ fpucw           [{ test $HAVE_DECL_LDEXPL = 0 || test $gl_func_ldexpl = no; } &&
 
 configure.ac:
 gl_FUNC_LDEXPL
-if test $HAVE_DECL_LDEXPL = 0 || test $gl_func_ldexpl = no; then
-  AC_LIBOBJ([ldexpl])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_LDEXPL],
+               [test $HAVE_DECL_LDEXPL = 0 || test $gl_func_ldexpl = no])
 gl_MATH_MODULE_INDICATOR([ldexpl])
 
 Makefile.am:
+if GL_COND_OBJ_LDEXPL
+lib_SOURCES += ldexpl.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/libgmp b/modules/libgmp
index acf4fe56f1..b8a7c0c32a 100644
--- a/modules/libgmp
+++ b/modules/libgmp
@@ -13,9 +13,7 @@ configure.ac:
 gl_LIBGMP
 gl_CONDITIONAL_HEADER([gmp.h])
 AC_PROG_MKDIR_P
-if test $HAVE_LIBGMP != yes; then
-  AC_LIBOBJ([mini-gmp-gnulib])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_MINI_GMP_GNULIB], [test $HAVE_LIBGMP != yes])
 
 Makefile.am:
 BUILT_SOURCES += $(GMP_H)
@@ -41,6 +39,10 @@ gmp.h: $(top_builddir)/config.status
 endif
 MOSTLYCLEANFILES += gmp.h gmp.h-t
 
+if GL_COND_OBJ_MINI_GMP_GNULIB
+lib_SOURCES += mini-gmp-gnulib.c
+endif
+
 Include:
 <gmp.h>
 
diff --git a/modules/link b/modules/link
index 93ccb192b0..32c438ce63 100644
--- a/modules/link
+++ b/modules/link
@@ -14,12 +14,14 @@ sys_stat        [test $HAVE_LINK = 0 || test $REPLACE_LINK = 1]
 
 configure.ac:
 gl_FUNC_LINK
-if test $HAVE_LINK = 0 || test $REPLACE_LINK = 1; then
-  AC_LIBOBJ([link])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_LINK],
+               [test $HAVE_LINK = 0 || test $REPLACE_LINK = 1])
 gl_UNISTD_MODULE_INDICATOR([link])
 
 Makefile.am:
+if GL_COND_OBJ_LINK
+lib_SOURCES += link.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/linkat b/modules/linkat
index 2541bf90e9..fea65dbd9d 100644
--- a/modules/linkat
+++ b/modules/linkat
@@ -34,13 +34,17 @@ fstatat          [test $REPLACE_LINKAT = 1]
 
 configure.ac:
 gl_FUNC_LINKAT
-if test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1; then
-  AC_LIBOBJ([linkat])
+gl_CONDITIONAL([GL_COND_OBJ_LINKAT],
+               [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1])
+AM_COND_IF([GL_COND_OBJ_LINKAT], [
   AC_LIBOBJ([at-func2])
-fi
+])
 gl_UNISTD_MODULE_INDICATOR([linkat])
 
 Makefile.am:
+if GL_COND_OBJ_LINKAT
+lib_SOURCES += linkat.c
+endif
 
 Include:
 <fcntl.h>
diff --git a/modules/listen b/modules/listen
index 5f96dae9be..877bc14bdc 100644
--- a/modules/listen
+++ b/modules/listen
@@ -13,12 +13,13 @@ msvc-nothrow    [test "$ac_cv_header_winsock2_h" = yes]
 
 configure.ac:
 AC_REQUIRE([gl_SYS_SOCKET_H])
-if test "$ac_cv_header_winsock2_h" = yes; then
-  AC_LIBOBJ([listen])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_LISTEN], [test "$ac_cv_header_winsock2_h" = yes])
 gl_SYS_SOCKET_MODULE_INDICATOR([listen])
 
 Makefile.am:
+if GL_COND_OBJ_LISTEN
+lib_SOURCES += listen.c
+endif
 
 Include:
 <sys/socket.h>
diff --git a/modules/localeconv b/modules/localeconv
index a99d87811f..04ac36ed79 100644
--- a/modules/localeconv
+++ b/modules/localeconv
@@ -11,13 +11,16 @@ locale
 
 configure.ac:
 gl_FUNC_LOCALECONV
-if test $REPLACE_LOCALECONV = 1; then
-  AC_LIBOBJ([localeconv])
+gl_CONDITIONAL([GL_COND_OBJ_LOCALECONV], [test $REPLACE_LOCALECONV = 1])
+AM_COND_IF([GL_COND_OBJ_LOCALECONV], [
   gl_PREREQ_LOCALECONV
-fi
+])
 gl_LOCALE_MODULE_INDICATOR([localeconv])
 
 Makefile.am:
+if GL_COND_OBJ_LOCALECONV
+lib_SOURCES += localeconv.c
+endif
 
 Include:
 <locale.h>
diff --git a/modules/localtime b/modules/localtime
index 5da46a9550..99a2d00dcd 100644
--- a/modules/localtime
+++ b/modules/localtime
@@ -10,12 +10,13 @@ time
 
 configure.ac:
 gl_FUNC_LOCALTIME
-if test $REPLACE_LOCALTIME = 1; then
-  AC_LIBOBJ([localtime])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_LOCALTIME], [test $REPLACE_LOCALTIME = 1])
 gl_TIME_MODULE_INDICATOR([localtime])
 
 Makefile.am:
+if GL_COND_OBJ_LOCALTIME
+lib_SOURCES += localtime.c
+endif
 
 Include:
 <time.h>
diff --git a/modules/log b/modules/log
index e701284e85..588c17c545 100644
--- a/modules/log
+++ b/modules/log
@@ -11,12 +11,13 @@ math
 
 configure.ac:
 AC_REQUIRE([gl_FUNC_LOG])
-if test $REPLACE_LOG = 1; then
-  AC_LIBOBJ([log])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_LOG], [test $REPLACE_LOG = 1])
 gl_MATH_MODULE_INDICATOR([log])
 
 Makefile.am:
+if GL_COND_OBJ_LOG
+lib_SOURCES += log.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/log10 b/modules/log10
index a4b91cdd8b..6e381c2dd8 100644
--- a/modules/log10
+++ b/modules/log10
@@ -11,12 +11,13 @@ math
 
 configure.ac:
 gl_FUNC_LOG10
-if test $REPLACE_LOG10 = 1; then
-  AC_LIBOBJ([log10])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_LOG10], [test $REPLACE_LOG10 = 1])
 gl_MATH_MODULE_INDICATOR([log10])
 
 Makefile.am:
+if GL_COND_OBJ_LOG10
+lib_SOURCES += log10.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/log10f b/modules/log10f
index 8e56434152..cf758e4313 100644
--- a/modules/log10f
+++ b/modules/log10f
@@ -12,12 +12,14 @@ log10           [test $HAVE_LOG10F = 0 || test $REPLACE_LOG10F = 1]
 
 configure.ac:
 gl_FUNC_LOG10F
-if test $HAVE_LOG10F = 0 || test $REPLACE_LOG10F = 1; then
-  AC_LIBOBJ([log10f])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_LOG10F],
+               [test $HAVE_LOG10F = 0 || test $REPLACE_LOG10F = 1])
 gl_MATH_MODULE_INDICATOR([log10f])
 
 Makefile.am:
+if GL_COND_OBJ_LOG10F
+lib_SOURCES += log10f.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/log10l b/modules/log10l
index bcd874af04..e6854fa500 100644
--- a/modules/log10l
+++ b/modules/log10l
@@ -14,12 +14,14 @@ logl            [{ test $HAVE_LOG10L = 0 || test $REPLACE_LOG10L = 1; } && test
 
 configure.ac:
 gl_FUNC_LOG10L
-if test $HAVE_LOG10L = 0 || test $REPLACE_LOG10L = 1; then
-  AC_LIBOBJ([log10l])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_LOG10L],
+               [test $HAVE_LOG10L = 0 || test $REPLACE_LOG10L = 1])
 gl_MATH_MODULE_INDICATOR([log10l])
 
 Makefile.am:
+if GL_COND_OBJ_LOG10L
+lib_SOURCES += log10l.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/log1p b/modules/log1p
index ddf464a166..cae886abc4 100644
--- a/modules/log1p
+++ b/modules/log1p
@@ -15,12 +15,14 @@ round           [test $HAVE_LOG1P = 0 || test $REPLACE_LOG1P = 1]
 
 configure.ac:
 gl_FUNC_LOG1P
-if test $HAVE_LOG1P = 0 || test $REPLACE_LOG1P = 1; then
-  AC_LIBOBJ([log1p])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_LOG1P],
+               [test $HAVE_LOG1P = 0 || test $REPLACE_LOG1P = 1])
 gl_MATH_MODULE_INDICATOR([log1p])
 
 Makefile.am:
+if GL_COND_OBJ_LOG1P
+lib_SOURCES += log1p.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/log1pf b/modules/log1pf
index faffccfe15..2e14ff4a60 100644
--- a/modules/log1pf
+++ b/modules/log1pf
@@ -12,12 +12,14 @@ log1p           [test $HAVE_LOG1PF = 0 || test $REPLACE_LOG1PF = 1]
 
 configure.ac:
 gl_FUNC_LOG1PF
-if test $HAVE_LOG1PF = 0 || test $REPLACE_LOG1PF = 1; then
-  AC_LIBOBJ([log1pf])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_LOG1PF],
+               [test $HAVE_LOG1PF = 0 || test $REPLACE_LOG1PF = 1])
 gl_MATH_MODULE_INDICATOR([log1pf])
 
 Makefile.am:
+if GL_COND_OBJ_LOG1PF
+lib_SOURCES += log1pf.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/log1pl b/modules/log1pl
index f0efaadf4a..c5c94be103 100644
--- a/modules/log1pl
+++ b/modules/log1pl
@@ -15,12 +15,14 @@ roundl          [{ test $HAVE_LOG1PL = 0 || test $REPLACE_LOG1PL = 1; } && test
 
 configure.ac:
 gl_FUNC_LOG1PL
-if test $HAVE_LOG1PL = 0 || test $REPLACE_LOG1PL = 1; then
-  AC_LIBOBJ([log1pl])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_LOG1PL],
+               [test $HAVE_LOG1PL = 0 || test $REPLACE_LOG1PL = 1])
 gl_MATH_MODULE_INDICATOR([log1pl])
 
 Makefile.am:
+if GL_COND_OBJ_LOG1PL
+lib_SOURCES += log1pl.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/log2 b/modules/log2
index e699be522d..344b7e2722 100644
--- a/modules/log2
+++ b/modules/log2
@@ -15,12 +15,14 @@ log             [test $HAVE_LOG2 = 0 || test $REPLACE_LOG2 = 1]
 
 configure.ac:
 gl_FUNC_LOG2
-if test $HAVE_LOG2 = 0 || test $REPLACE_LOG2 = 1; then
-  AC_LIBOBJ([log2])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_LOG2],
+               [test $HAVE_LOG2 = 0 || test $REPLACE_LOG2 = 1])
 gl_MATH_MODULE_INDICATOR([log2])
 
 Makefile.am:
+if GL_COND_OBJ_LOG2
+lib_SOURCES += log2.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/log2f b/modules/log2f
index c012c3b89a..4770a0781b 100644
--- a/modules/log2f
+++ b/modules/log2f
@@ -15,12 +15,14 @@ logf            [test $HAVE_LOG2F = 0 || test $REPLACE_LOG2F = 1]
 
 configure.ac:
 gl_FUNC_LOG2F
-if test $HAVE_LOG2F = 0 || test $REPLACE_LOG2F = 1; then
-  AC_LIBOBJ([log2f])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_LOG2F],
+               [test $HAVE_LOG2F = 0 || test $REPLACE_LOG2F = 1])
 gl_MATH_MODULE_INDICATOR([log2f])
 
 Makefile.am:
+if GL_COND_OBJ_LOG2F
+lib_SOURCES += log2f.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/log2l b/modules/log2l
index 8cc342786e..166061d89a 100644
--- a/modules/log2l
+++ b/modules/log2l
@@ -15,12 +15,14 @@ logl            [{ test $HAVE_LOG2L = 0 || test $REPLACE_LOG2L = 1; } && test $H
 
 configure.ac:
 gl_FUNC_LOG2L
-if test $HAVE_LOG2L = 0 || test $REPLACE_LOG2L = 1; then
-  AC_LIBOBJ([log2l])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_LOG2L],
+               [test $HAVE_LOG2L = 0 || test $REPLACE_LOG2L = 1])
 gl_MATH_MODULE_INDICATOR([log2l])
 
 Makefile.am:
+if GL_COND_OBJ_LOG2L
+lib_SOURCES += log2l.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/logb b/modules/logb
index bba96bb2b9..5b681a5c08 100644
--- a/modules/logb
+++ b/modules/logb
@@ -15,12 +15,14 @@ isnand          [test $HAVE_LOGB = 0 || test $REPLACE_LOGB = 1]
 
 configure.ac:
 gl_FUNC_LOGB
-if test $HAVE_LOGB = 0 || test $REPLACE_LOGB = 1; then
-  AC_LIBOBJ([logb])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_LOGB],
+               [test $HAVE_LOGB = 0 || test $REPLACE_LOGB = 1])
 gl_MATH_MODULE_INDICATOR([logb])
 
 Makefile.am:
+if GL_COND_OBJ_LOGB
+lib_SOURCES += logb.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/logbf b/modules/logbf
index c7eb47683b..eba909af4b 100644
--- a/modules/logbf
+++ b/modules/logbf
@@ -16,12 +16,14 @@ isnanf          [test $HAVE_LOGBF = 0 || test $REPLACE_LOGBF = 1]
 
 configure.ac:
 gl_FUNC_LOGBF
-if test $HAVE_LOGBF = 0 || test $REPLACE_LOGBF = 1; then
-  AC_LIBOBJ([logbf])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_LOGBF],
+               [test $HAVE_LOGBF = 0 || test $REPLACE_LOGBF = 1])
 gl_MATH_MODULE_INDICATOR([logbf])
 
 Makefile.am:
+if GL_COND_OBJ_LOGBF
+lib_SOURCES += logbf.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/logbl b/modules/logbl
index 5a18291afb..b4426213f9 100644
--- a/modules/logbl
+++ b/modules/logbl
@@ -17,12 +17,14 @@ isnanl          [{ test $HAVE_LOGBL = 0 || test $REPLACE_LOGBL = 1; } && test $H
 
 configure.ac:
 gl_FUNC_LOGBL
-if test $HAVE_LOGBL = 0 || test $REPLACE_LOGBL = 1; then
-  AC_LIBOBJ([logbl])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_LOGBL],
+               [test $HAVE_LOGBL = 0 || test $REPLACE_LOGBL = 1])
 gl_MATH_MODULE_INDICATOR([logbl])
 
 Makefile.am:
+if GL_COND_OBJ_LOGBL
+lib_SOURCES += logbl.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/logf b/modules/logf
index 283822e9e3..e63625b502 100644
--- a/modules/logf
+++ b/modules/logf
@@ -12,12 +12,14 @@ log             [test $HAVE_LOGF = 0 || test $REPLACE_LOGF = 1]
 
 configure.ac:
 gl_FUNC_LOGF
-if test $HAVE_LOGF = 0 || test $REPLACE_LOGF = 1; then
-  AC_LIBOBJ([logf])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_LOGF],
+               [test $HAVE_LOGF = 0 || test $REPLACE_LOGF = 1])
 gl_MATH_MODULE_INDICATOR([logf])
 
 Makefile.am:
+if GL_COND_OBJ_LOGF
+lib_SOURCES += logf.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/login_tty b/modules/login_tty
index 551691e2c5..aa46b7f8b0 100644
--- a/modules/login_tty
+++ b/modules/login_tty
@@ -13,12 +13,13 @@ open            [test $ac_cv_func_login_tty = no]
 
 configure.ac:
 gl_FUNC_LOGIN_TTY
-if test $ac_cv_func_login_tty = no; then
-  AC_LIBOBJ([login_tty])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_LOGIN_TTY], [test $ac_cv_func_login_tty = no])
 gl_PTY_MODULE_INDICATOR([login_tty])
 
 Makefile.am:
+if GL_COND_OBJ_LOGIN_TTY
+lib_SOURCES += login_tty.c
+endif
 
 Include:
 extern int login_tty (int);
diff --git a/modules/logl b/modules/logl
index 450b039ed8..2933c4e455 100644
--- a/modules/logl
+++ b/modules/logl
@@ -15,12 +15,14 @@ floorl          [{ test $HAVE_LOGL = 0 || test $REPLACE_LOGL = 1; } && test $HAV
 
 configure.ac:
 gl_FUNC_LOGL
-if test $HAVE_LOGL = 0 || test $REPLACE_LOGL = 1; then
-  AC_LIBOBJ([logl])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_LOGL],
+               [test $HAVE_LOGL = 0 || test $REPLACE_LOGL = 1])
 gl_MATH_MODULE_INDICATOR([logl])
 
 Makefile.am:
+if GL_COND_OBJ_LOGL
+lib_SOURCES += logl.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/lseek b/modules/lseek
index f60809319f..17d02a79c5 100644
--- a/modules/lseek
+++ b/modules/lseek
@@ -14,12 +14,13 @@ fstat           [test "$gl_cv_func_lseek_pipe" = no]
 
 configure.ac:
 gl_FUNC_LSEEK
-if test $REPLACE_LSEEK = 1; then
-  AC_LIBOBJ([lseek])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_LSEEK], [test $REPLACE_LSEEK = 1])
 gl_UNISTD_MODULE_INDICATOR([lseek])
 
 Makefile.am:
+if GL_COND_OBJ_LSEEK
+lib_SOURCES += lseek.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/lstat b/modules/lstat
index 6173858c0c..c6bb4b85c3 100644
--- a/modules/lstat
+++ b/modules/lstat
@@ -13,13 +13,16 @@ stat-time       [test $REPLACE_LSTAT = 1]
 
 configure.ac:
 gl_FUNC_LSTAT
-if test $REPLACE_LSTAT = 1; then
-  AC_LIBOBJ([lstat])
+gl_CONDITIONAL([GL_COND_OBJ_LSTAT], [test $REPLACE_LSTAT = 1])
+AM_COND_IF([GL_COND_OBJ_LSTAT], [
   gl_PREREQ_LSTAT
-fi
+])
 gl_SYS_STAT_MODULE_INDICATOR([lstat])
 
 Makefile.am:
+if GL_COND_OBJ_LSTAT
+lib_SOURCES += lstat.c
+endif
 
 Include:
 <sys/stat.h>
diff --git a/modules/mbrlen b/modules/mbrlen
index b06362a7bc..420e8895d7 100644
--- a/modules/mbrlen
+++ b/modules/mbrlen
@@ -13,13 +13,17 @@ mbrtowc         [test $HAVE_MBRLEN = 0 || test $REPLACE_MBRLEN = 1]
 
 configure.ac:
 gl_FUNC_MBRLEN
-if test $HAVE_MBRLEN = 0 || test $REPLACE_MBRLEN = 1; then
-  AC_LIBOBJ([mbrlen])
+gl_CONDITIONAL([GL_COND_OBJ_MBRLEN],
+               [test $HAVE_MBRLEN = 0 || test $REPLACE_MBRLEN = 1])
+AM_COND_IF([GL_COND_OBJ_MBRLEN], [
   gl_PREREQ_MBRLEN
-fi
+])
 gl_WCHAR_MODULE_INDICATOR([mbrlen])
 
 Makefile.am:
+if GL_COND_OBJ_MBRLEN
+lib_SOURCES += mbrlen.c
+endif
 
 Include:
 <wchar.h>
diff --git a/modules/mbrtoc32 b/modules/mbrtoc32
index 2e5042a5bc..63ed5ebe1f 100644
--- a/modules/mbrtoc32
+++ b/modules/mbrtoc32
@@ -28,18 +28,22 @@ verify          [test $HAVE_MBRTOC32 = 0 || test $REPLACE_MBRTOC32 = 1]
 
 configure.ac:
 gl_FUNC_MBRTOC32
-if test $HAVE_MBRTOC32 = 0 || test $REPLACE_MBRTOC32 = 1; then
-  AC_LIBOBJ([mbrtoc32])
+gl_CONDITIONAL([GL_COND_OBJ_MBRTOC32],
+               [test $HAVE_MBRTOC32 = 0 || test $REPLACE_MBRTOC32 = 1])
+AM_COND_IF([GL_COND_OBJ_MBRTOC32], [
   if test $REPLACE_MBSTATE_T = 1; then
     AC_LIBOBJ([lc-charset-dispatch])
     AC_LIBOBJ([mbtowc-lock])
     gl_PREREQ_MBTOWC_LOCK
   fi
   gl_PREREQ_MBRTOC32
-fi
+])
 gl_UCHAR_MODULE_INDICATOR([mbrtoc32])
 
 Makefile.am:
+if GL_COND_OBJ_MBRTOC32
+lib_SOURCES += mbrtoc32.c
+endif
 
 Include:
 <uchar.h>
diff --git a/modules/mbrtowc b/modules/mbrtowc
index 0b6478e90e..ed9ebd7152 100644
--- a/modules/mbrtowc
+++ b/modules/mbrtowc
@@ -32,18 +32,22 @@ verify          [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1]
 
 configure.ac:
 gl_FUNC_MBRTOWC
-if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
-  AC_LIBOBJ([mbrtowc])
+gl_CONDITIONAL([GL_COND_OBJ_MBRTOWC],
+               [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1])
+AM_COND_IF([GL_COND_OBJ_MBRTOWC], [
   if test $REPLACE_MBSTATE_T = 1; then
     AC_LIBOBJ([lc-charset-dispatch])
     AC_LIBOBJ([mbtowc-lock])
     gl_PREREQ_MBTOWC_LOCK
   fi
   gl_PREREQ_MBRTOWC
-fi
+])
 gl_WCHAR_MODULE_INDICATOR([mbrtowc])
 
 Makefile.am:
+if GL_COND_OBJ_MBRTOWC
+lib_SOURCES += mbrtowc.c
+endif
 
 Include:
 <wchar.h>
diff --git a/modules/mbsinit b/modules/mbsinit
index 3f7596d0ee..c500620b40 100644
--- a/modules/mbsinit
+++ b/modules/mbsinit
@@ -14,13 +14,17 @@ verify          [test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1]
 
 configure.ac:
 gl_FUNC_MBSINIT
-if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then
-  AC_LIBOBJ([mbsinit])
+gl_CONDITIONAL([GL_COND_OBJ_MBSINIT],
+               [test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1])
+AM_COND_IF([GL_COND_OBJ_MBSINIT], [
   gl_PREREQ_MBSINIT
-fi
+])
 gl_WCHAR_MODULE_INDICATOR([mbsinit])
 
 Makefile.am:
+if GL_COND_OBJ_MBSINIT
+lib_SOURCES += mbsinit.c
+endif
 
 Include:
 <wchar.h>
diff --git a/modules/mbsnrtowcs b/modules/mbsnrtowcs
index 2f1c52db9a..760448d02a 100644
--- a/modules/mbsnrtowcs
+++ b/modules/mbsnrtowcs
@@ -17,14 +17,18 @@ strnlen1        [test $HAVE_MBSNRTOWCS = 0 || test $REPLACE_MBSNRTOWCS = 1]
 
 configure.ac:
 gl_FUNC_MBSNRTOWCS
-if test $HAVE_MBSNRTOWCS = 0 || test $REPLACE_MBSNRTOWCS = 1; then
-  AC_LIBOBJ([mbsnrtowcs])
+gl_CONDITIONAL([GL_COND_OBJ_MBSNRTOWCS],
+               [test $HAVE_MBSNRTOWCS = 0 || test $REPLACE_MBSNRTOWCS = 1])
+AM_COND_IF([GL_COND_OBJ_MBSNRTOWCS], [
   AC_LIBOBJ([mbsrtowcs-state])
   gl_PREREQ_MBSNRTOWCS
-fi
+])
 gl_WCHAR_MODULE_INDICATOR([mbsnrtowcs])
 
 Makefile.am:
+if GL_COND_OBJ_MBSNRTOWCS
+lib_SOURCES += mbsnrtowcs.c
+endif
 
 Include:
 <wchar.h>
diff --git a/modules/mbsrtowcs b/modules/mbsrtowcs
index 9da2d07416..15be6c2a60 100644
--- a/modules/mbsrtowcs
+++ b/modules/mbsrtowcs
@@ -20,14 +20,18 @@ strnlen1        [test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1]
 
 configure.ac:
 gl_FUNC_MBSRTOWCS
-if test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1; then
-  AC_LIBOBJ([mbsrtowcs])
+gl_CONDITIONAL([GL_COND_OBJ_MBSRTOWCS],
+               [test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1])
+AM_COND_IF([GL_COND_OBJ_MBSRTOWCS], [
   AC_LIBOBJ([mbsrtowcs-state])
   gl_PREREQ_MBSRTOWCS
-fi
+])
 gl_WCHAR_MODULE_INDICATOR([mbsrtowcs])
 
 Makefile.am:
+if GL_COND_OBJ_MBSRTOWCS
+lib_SOURCES += mbsrtowcs.c
+endif
 
 Include:
 <wchar.h>
diff --git a/modules/mbtowc b/modules/mbtowc
index 2db32deb14..fcfb1cc431 100644
--- a/modules/mbtowc
+++ b/modules/mbtowc
@@ -13,13 +13,17 @@ wchar           [test $HAVE_MBTOWC = 0 || test $REPLACE_MBTOWC = 1]
 
 configure.ac:
 gl_FUNC_MBTOWC
-if test $HAVE_MBTOWC = 0 || test $REPLACE_MBTOWC = 1; then
-  AC_LIBOBJ([mbtowc])
+gl_CONDITIONAL([GL_COND_OBJ_MBTOWC],
+               [test $HAVE_MBTOWC = 0 || test $REPLACE_MBTOWC = 1])
+AM_COND_IF([GL_COND_OBJ_MBTOWC], [
   gl_PREREQ_MBTOWC
-fi
+])
 gl_STDLIB_MODULE_INDICATOR([mbtowc])
 
 Makefile.am:
+if GL_COND_OBJ_MBTOWC
+lib_SOURCES += mbtowc.c
+endif
 
 Include:
 <stdlib.h>
diff --git a/modules/memalign b/modules/memalign
index b383d196d1..3ab24a58e8 100644
--- a/modules/memalign
+++ b/modules/memalign
@@ -10,12 +10,13 @@ malloc-h
 
 configure.ac:
 gl_FUNC_MEMALIGN
-if test $REPLACE_MEMALIGN = 1; then
-  AC_LIBOBJ([memalign])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_MEMALIGN], [test $REPLACE_MEMALIGN = 1])
 gl_MALLOC_MODULE_INDICATOR([memalign])
 
 Makefile.am:
+if GL_COND_OBJ_MEMALIGN
+lib_SOURCES += memalign.c
+endif
 
 Include:
 #include <malloc.h>
diff --git a/modules/memchr b/modules/memchr
index 3a413a20b4..d722c92083 100644
--- a/modules/memchr
+++ b/modules/memchr
@@ -13,13 +13,16 @@ string
 
 configure.ac:
 gl_FUNC_MEMCHR
-if test $REPLACE_MEMCHR = 1; then
-  AC_LIBOBJ([memchr])
+gl_CONDITIONAL([GL_COND_OBJ_MEMCHR], [test $REPLACE_MEMCHR = 1])
+AM_COND_IF([GL_COND_OBJ_MEMCHR], [
   gl_PREREQ_MEMCHR
-fi
+])
 gl_STRING_MODULE_INDICATOR([memchr])
 
 Makefile.am:
+if GL_COND_OBJ_MEMCHR
+lib_SOURCES += memchr.c
+endif
 
 Include:
 <string.h>
diff --git a/modules/memcmp b/modules/memcmp
index 5b35a75fa9..f40d6713ec 100644
--- a/modules/memcmp
+++ b/modules/memcmp
@@ -16,12 +16,15 @@ stdint          [test $gl_func_memcmp = no]
 
 configure.ac:
 gl_FUNC_MEMCMP
-if test $gl_func_memcmp = no; then
-  AC_LIBOBJ([memcmp])
+gl_CONDITIONAL([GL_COND_OBJ_MEMCMP], [test $gl_func_memcmp = no])
+AM_COND_IF([GL_COND_OBJ_MEMCMP], [
   gl_PREREQ_MEMCMP
-fi
+])
 
 Makefile.am:
+if GL_COND_OBJ_MEMCMP
+lib_SOURCES += memcmp.c
+endif
 
 Include:
 <string.h>
diff --git a/modules/memcpy b/modules/memcpy
index 33b5365601..4083b0f4de 100644
--- a/modules/memcpy
+++ b/modules/memcpy
@@ -16,12 +16,15 @@ string
 
 configure.ac:
 gl_FUNC_MEMCPY
-if test $ac_cv_func_memcpy = no; then
-  AC_LIBOBJ([memcpy])
+gl_CONDITIONAL([GL_COND_OBJ_MEMCPY], [test $ac_cv_func_memcpy = no])
+AM_COND_IF([GL_COND_OBJ_MEMCPY], [
   gl_PREREQ_MEMCPY
-fi
+])
 
 Makefile.am:
+if GL_COND_OBJ_MEMCPY
+lib_SOURCES += memcpy.c
+endif
 
 Include:
 <string.h>
diff --git a/modules/memmove b/modules/memmove
index b4ded41b4a..2afdb07d39 100644
--- a/modules/memmove
+++ b/modules/memmove
@@ -16,12 +16,15 @@ string
 
 configure.ac:
 gl_FUNC_MEMMOVE
-if test $ac_cv_func_memmove = no; then
-  AC_LIBOBJ([memmove])
+gl_CONDITIONAL([GL_COND_OBJ_MEMMOVE], [test $ac_cv_func_memmove = no])
+AM_COND_IF([GL_COND_OBJ_MEMMOVE], [
   gl_PREREQ_MEMMOVE
-fi
+])
 
 Makefile.am:
+if GL_COND_OBJ_MEMMOVE
+lib_SOURCES += memmove.c
+endif
 
 Include:
 <string.h>
diff --git a/modules/mempcpy b/modules/mempcpy
index 59009aaeb0..142ce7fdca 100644
--- a/modules/mempcpy
+++ b/modules/mempcpy
@@ -11,13 +11,16 @@ string
 
 configure.ac:
 gl_FUNC_MEMPCPY
-if test $HAVE_MEMPCPY = 0; then
-  AC_LIBOBJ([mempcpy])
+gl_CONDITIONAL([GL_COND_OBJ_MEMPCPY], [test $HAVE_MEMPCPY = 0])
+AM_COND_IF([GL_COND_OBJ_MEMPCPY], [
   gl_PREREQ_MEMPCPY
-fi
+])
 gl_STRING_MODULE_INDICATOR([mempcpy])
 
 Makefile.am:
+if GL_COND_OBJ_MEMPCPY
+lib_SOURCES += mempcpy.c
+endif
 
 Include:
 <string.h>
diff --git a/modules/memrchr b/modules/memrchr
index 62f7c34484..c6b832a8cd 100644
--- a/modules/memrchr
+++ b/modules/memrchr
@@ -11,13 +11,16 @@ string
 
 configure.ac:
 gl_FUNC_MEMRCHR
-if test $ac_cv_func_memrchr = no; then
-  AC_LIBOBJ([memrchr])
+gl_CONDITIONAL([GL_COND_OBJ_MEMRCHR], [test $ac_cv_func_memrchr = no])
+AM_COND_IF([GL_COND_OBJ_MEMRCHR], [
   gl_PREREQ_MEMRCHR
-fi
+])
 gl_STRING_MODULE_INDICATOR([memrchr])
 
 Makefile.am:
+if GL_COND_OBJ_MEMRCHR
+lib_SOURCES += memrchr.c
+endif
 
 Include:
 <string.h>
diff --git a/modules/memset b/modules/memset
index 95941379f4..defc5baf7d 100644
--- a/modules/memset
+++ b/modules/memset
@@ -16,12 +16,15 @@ string
 
 configure.ac:
 gl_FUNC_MEMSET
-if test $ac_cv_func_memset = no; then
-  AC_LIBOBJ([memset])
+gl_CONDITIONAL([GL_COND_OBJ_MEMSET], [test $ac_cv_func_memset = no])
+AM_COND_IF([GL_COND_OBJ_MEMSET], [
   gl_PREREQ_MEMSET
-fi
+])
 
 Makefile.am:
+if GL_COND_OBJ_MEMSET
+lib_SOURCES += memset.c
+endif
 
 Include:
 <string.h>
diff --git a/modules/mkdir b/modules/mkdir
index fb24458a9a..8570a4a7e4 100644
--- a/modules/mkdir
+++ b/modules/mkdir
@@ -12,12 +12,13 @@ stat            [test $REPLACE_MKDIR = 1]
 
 configure.ac:
 gl_FUNC_MKDIR
-if test $REPLACE_MKDIR = 1; then
-  AC_LIBOBJ([mkdir])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_MKDIR], [test $REPLACE_MKDIR = 1])
 gl_SYS_STAT_MODULE_INDICATOR([mkdir])
 
 Makefile.am:
+if GL_COND_OBJ_MKDIR
+lib_SOURCES += mkdir.c
+endif
 
 Include:
 <sys/stat.h>
diff --git a/modules/mkdirat b/modules/mkdirat
index 7b70a0b7a2..ced87fcea0 100644
--- a/modules/mkdirat
+++ b/modules/mkdirat
@@ -22,13 +22,16 @@ unistd          [test $HAVE_MKDIRAT = 0]
 
 configure.ac:
 gl_FUNC_MKDIRAT
-if test $HAVE_MKDIRAT = 0; then
-  AC_LIBOBJ([mkdirat])
+gl_CONDITIONAL([GL_COND_OBJ_MKDIRAT], [test $HAVE_MKDIRAT = 0])
+AM_COND_IF([GL_COND_OBJ_MKDIRAT], [
   gl_PREREQ_MKDIRAT
-fi
+])
 gl_SYS_STAT_MODULE_INDICATOR([mkdirat])
 
 Makefile.am:
+if GL_COND_OBJ_MKDIRAT
+lib_SOURCES += mkdirat.c
+endif
 
 Include:
 <sys/stat.h>
diff --git a/modules/mkdtemp b/modules/mkdtemp
index d4603bf594..bf531dddcf 100644
--- a/modules/mkdtemp
+++ b/modules/mkdtemp
@@ -12,13 +12,16 @@ tempname        [test $HAVE_MKDTEMP = 0]
 
 configure.ac:
 gl_FUNC_MKDTEMP
-if test $HAVE_MKDTEMP = 0; then
-  AC_LIBOBJ([mkdtemp])
+gl_CONDITIONAL([GL_COND_OBJ_MKDTEMP], [test $HAVE_MKDTEMP = 0])
+AM_COND_IF([GL_COND_OBJ_MKDTEMP], [
   gl_PREREQ_MKDTEMP
-fi
+])
 gl_STDLIB_MODULE_INDICATOR([mkdtemp])
 
 Makefile.am:
+if GL_COND_OBJ_MKDTEMP
+lib_SOURCES += mkdtemp.c
+endif
 
 Include:
 <stdlib.h>
diff --git a/modules/mkfifo b/modules/mkfifo
index 7bf43b44c9..4015f2cfea 100644
--- a/modules/mkfifo
+++ b/modules/mkfifo
@@ -11,12 +11,14 @@ stat            [test $HAVE_MKFIFO = 0 || test $REPLACE_MKFIFO = 1]
 
 configure.ac:
 gl_FUNC_MKFIFO
-if test $HAVE_MKFIFO = 0 || test $REPLACE_MKFIFO = 1; then
-  AC_LIBOBJ([mkfifo])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_MKFIFO],
+               [test $HAVE_MKFIFO = 0 || test $REPLACE_MKFIFO = 1])
 gl_UNISTD_MODULE_INDICATOR([mkfifo])
 
 Makefile.am:
+if GL_COND_OBJ_MKFIFO
+lib_SOURCES += mkfifo.c
+endif
 
 Include:
 <sys/stat.h>
diff --git a/modules/mkfifoat b/modules/mkfifoat
index 387ce09d6f..ce6e87ab58 100644
--- a/modules/mkfifoat
+++ b/modules/mkfifoat
@@ -25,16 +25,20 @@ mknod           [test $HAVE_MKNODAT = 0]
 
 configure.ac:
 gl_FUNC_MKFIFOAT
-if test $HAVE_MKFIFOAT = 0 || test $REPLACE_MKFIFOAT = 1; then
-  AC_LIBOBJ([mkfifoat])
-fi
-if test $HAVE_MKNODAT = 0 || test $REPLACE_MKNODAT = 1; then
-  AC_LIBOBJ([mknodat])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_MKFIFOAT],
+               [test $HAVE_MKFIFOAT = 0 || test $REPLACE_MKFIFOAT = 1])
+gl_CONDITIONAL([GL_COND_OBJ_MKNODAT],
+               [test $HAVE_MKNODAT = 0 || test $REPLACE_MKNODAT = 1])
 gl_SYS_STAT_MODULE_INDICATOR([mkfifoat])
 gl_SYS_STAT_MODULE_INDICATOR([mknodat])
 
 Makefile.am:
+if GL_COND_OBJ_MKFIFOAT
+lib_SOURCES += mkfifoat.c
+endif
+if GL_COND_OBJ_MKNODAT
+lib_SOURCES += mknodat.c
+endif
 
 Include:
 <fcntl.h>
diff --git a/modules/mknod b/modules/mknod
index 1f647efe70..683df1c298 100644
--- a/modules/mknod
+++ b/modules/mknod
@@ -13,12 +13,14 @@ stat            [test $HAVE_MKNOD = 0 || test $REPLACE_MKNOD = 1]
 
 configure.ac:
 gl_FUNC_MKNOD
-if test $HAVE_MKNOD = 0 || test $REPLACE_MKNOD = 1; then
-  AC_LIBOBJ([mknod])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_MKNOD],
+               [test $HAVE_MKNOD = 0 || test $REPLACE_MKNOD = 1])
 gl_UNISTD_MODULE_INDICATOR([mknod])
 
 Makefile.am:
+if GL_COND_OBJ_MKNOD
+lib_SOURCES += mknod.c
+endif
 
 Include:
 <sys/stat.h>
diff --git a/modules/mkostemp b/modules/mkostemp
index 8bfd9d5279..120b5d5d92 100644
--- a/modules/mkostemp
+++ b/modules/mkostemp
@@ -14,14 +14,17 @@ tempname        [test $HAVE_MKOSTEMP = 0]
 
 configure.ac:
 gl_FUNC_MKOSTEMP
-if test $HAVE_MKOSTEMP = 0; then
-  AC_LIBOBJ([mkostemp])
+gl_CONDITIONAL([GL_COND_OBJ_MKOSTEMP], [test $HAVE_MKOSTEMP = 0])
+AM_COND_IF([GL_COND_OBJ_MKOSTEMP], [
   gl_PREREQ_MKOSTEMP
-fi
+])
 gl_MODULE_INDICATOR([mkostemp])
 gl_STDLIB_MODULE_INDICATOR([mkostemp])
 
 Makefile.am:
+if GL_COND_OBJ_MKOSTEMP
+lib_SOURCES += mkostemp.c
+endif
 
 Include:
 <stdlib.h>
diff --git a/modules/mkostemps b/modules/mkostemps
index 0f67ab4a6a..5d6fe672f7 100644
--- a/modules/mkostemps
+++ b/modules/mkostemps
@@ -14,13 +14,14 @@ tempname        [test $HAVE_MKOSTEMPS = 0]
 
 configure.ac:
 gl_FUNC_MKOSTEMPS
-if test $HAVE_MKOSTEMPS = 0; then
-  AC_LIBOBJ([mkostemps])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_MKOSTEMPS], [test $HAVE_MKOSTEMPS = 0])
 gl_MODULE_INDICATOR([mkostemps])
 gl_STDLIB_MODULE_INDICATOR([mkostemps])
 
 Makefile.am:
+if GL_COND_OBJ_MKOSTEMPS
+lib_SOURCES += mkostemps.c
+endif
 
 Include:
 <stdlib.h>
diff --git a/modules/mkstemp b/modules/mkstemp
index ba0ef94c41..1b83548197 100644
--- a/modules/mkstemp
+++ b/modules/mkstemp
@@ -13,13 +13,17 @@ tempname        [test $HAVE_MKSTEMP = 0 || test $REPLACE_MKSTEMP = 1]
 
 configure.ac:
 gl_FUNC_MKSTEMP
-if test $HAVE_MKSTEMP = 0 || test $REPLACE_MKSTEMP = 1; then
-  AC_LIBOBJ([mkstemp])
+gl_CONDITIONAL([GL_COND_OBJ_MKSTEMP],
+               [test $HAVE_MKSTEMP = 0 || test $REPLACE_MKSTEMP = 1])
+AM_COND_IF([GL_COND_OBJ_MKSTEMP], [
   gl_PREREQ_MKSTEMP
-fi
+])
 gl_STDLIB_MODULE_INDICATOR([mkstemp])
 
 Makefile.am:
+if GL_COND_OBJ_MKSTEMP
+lib_SOURCES += mkstemp.c
+endif
 
 Include:
 <stdlib.h>
diff --git a/modules/mkstemps b/modules/mkstemps
index 364cfa852b..bcd44f5202 100644
--- a/modules/mkstemps
+++ b/modules/mkstemps
@@ -13,13 +13,14 @@ tempname        [test $HAVE_MKSTEMPS = 0]
 
 configure.ac:
 gl_FUNC_MKSTEMPS
-if test $HAVE_MKSTEMPS = 0; then
-  AC_LIBOBJ([mkstemps])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_MKSTEMPS], [test $HAVE_MKSTEMPS = 0])
 gl_MODULE_INDICATOR([mkstemps])
 gl_STDLIB_MODULE_INDICATOR([mkstemps])
 
 Makefile.am:
+if GL_COND_OBJ_MKSTEMPS
+lib_SOURCES += mkstemps.c
+endif
 
 Include:
 <stdlib.h>
diff --git a/modules/modf b/modules/modf
index 99d438fdd6..58c1994e7f 100644
--- a/modules/modf
+++ b/modules/modf
@@ -14,12 +14,13 @@ isinf           [test $REPLACE_MODF = 1]
 
 configure.ac:
 gl_FUNC_MODF
-if test $REPLACE_MODF = 1; then
-  AC_LIBOBJ([modf])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_MODF], [test $REPLACE_MODF = 1])
 gl_MATH_MODULE_INDICATOR([modf])
 
 Makefile.am:
+if GL_COND_OBJ_MODF
+lib_SOURCES += modf.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/modff b/modules/modff
index 2e049663a5..abee2456ca 100644
--- a/modules/modff
+++ b/modules/modff
@@ -13,12 +13,14 @@ modf            [test $HAVE_MODFF = 0 || test $REPLACE_MODFF = 1]
 
 configure.ac:
 gl_FUNC_MODFF
-if test $HAVE_MODFF = 0 || test $REPLACE_MODFF = 1; then
-  AC_LIBOBJ([modff])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_MODFF],
+               [test $HAVE_MODFF = 0 || test $REPLACE_MODFF = 1])
 gl_MATH_MODULE_INDICATOR([modff])
 
 Makefile.am:
+if GL_COND_OBJ_MODFF
+lib_SOURCES += modff.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/modfl b/modules/modfl
index 20717f4ecd..3f33c87bfb 100644
--- a/modules/modfl
+++ b/modules/modfl
@@ -16,12 +16,14 @@ isinf           [{ test $HAVE_MODFL = 0 || test $REPLACE_MODFL = 1; } && test $H
 
 configure.ac:
 gl_FUNC_MODFL
-if test $HAVE_MODFL = 0 || test $REPLACE_MODFL = 1; then
-  AC_LIBOBJ([modfl])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_MODFL],
+               [test $HAVE_MODFL = 0 || test $REPLACE_MODFL = 1])
 gl_MATH_MODULE_INDICATOR([modfl])
 
 Makefile.am:
+if GL_COND_OBJ_MODFL
+lib_SOURCES += modfl.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/mountlist b/modules/mountlist
index 043c7a2908..f61038ec15 100644
--- a/modules/mountlist
+++ b/modules/mountlist
@@ -20,12 +20,15 @@ xalloc
 
 configure.ac:
 gl_MOUNTLIST
-if test $gl_cv_list_mounted_fs = yes; then
-  AC_LIBOBJ([mountlist])
+gl_CONDITIONAL([GL_COND_OBJ_MOUNTLIST], [test $gl_cv_list_mounted_fs = yes])
+AM_COND_IF([GL_COND_OBJ_MOUNTLIST], [
   gl_PREREQ_MOUNTLIST_EXTRA
-fi
+])
 
 Makefile.am:
+if GL_COND_OBJ_MOUNTLIST
+lib_SOURCES += mountlist.c
+endif
 
 Include:
 "mountlist.h"
diff --git a/modules/msvc-inval b/modules/msvc-inval
index 5907190b1a..f8a6adac56 100644
--- a/modules/msvc-inval
+++ b/modules/msvc-inval
@@ -10,11 +10,13 @@ Depends-on:
 
 configure.ac:
 AC_REQUIRE([gl_MSVC_INVAL])
-if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
-  AC_LIBOBJ([msvc-inval])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_MSVC_INVAL],
+               [test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1])
 
 Makefile.am:
+if GL_COND_OBJ_MSVC_INVAL
+lib_SOURCES += msvc-inval.c
+endif
 
 Include:
 #if HAVE_MSVC_INVALID_PARAMETER_HANDLER
diff --git a/modules/msvc-nothrow b/modules/msvc-nothrow
index 4cb5834b74..1f05526d79 100644
--- a/modules/msvc-nothrow
+++ b/modules/msvc-nothrow
@@ -12,12 +12,14 @@ msvc-inval
 
 configure.ac:
 AC_REQUIRE([gl_MSVC_NOTHROW])
-if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
-  AC_LIBOBJ([msvc-nothrow])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_MSVC_NOTHROW],
+               [test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1])
 gl_MODULE_INDICATOR([msvc-nothrow])
 
 Makefile.am:
+if GL_COND_OBJ_MSVC_NOTHROW
+lib_SOURCES += msvc-nothrow.c
+endif
 
 Include:
 #if GNULIB_MSVC_NOTHROW
diff --git a/modules/mtx b/modules/mtx
index ade00b25eb..e5da0413db 100644
--- a/modules/mtx
+++ b/modules/mtx
@@ -14,12 +14,13 @@ windows-timedrecmutex
 
 configure.ac:
 AC_REQUIRE([gl_THREADS_H])
-if test $HAVE_THREADS_H = 0; then
-  AC_LIBOBJ([mtx])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_MTX], [test $HAVE_THREADS_H = 0])
 gl_THREADS_MODULE_INDICATOR([mtx])
 
 Makefile.am:
+if GL_COND_OBJ_MTX
+lib_SOURCES += mtx.c
+endif
 
 Include:
 <threads.h>
diff --git a/modules/nanosleep b/modules/nanosleep
index bf034df06b..53c5dc5f7c 100644
--- a/modules/nanosleep
+++ b/modules/nanosleep
@@ -19,13 +19,17 @@ verify          [test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1]
 
 configure.ac:
 gl_FUNC_NANOSLEEP
-if test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1; then
-  AC_LIBOBJ([nanosleep])
+gl_CONDITIONAL([GL_COND_OBJ_NANOSLEEP],
+               [test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1])
+AM_COND_IF([GL_COND_OBJ_NANOSLEEP], [
   gl_PREREQ_NANOSLEEP
-fi
+])
 gl_TIME_MODULE_INDICATOR([nanosleep])
 
 Makefile.am:
+if GL_COND_OBJ_NANOSLEEP
+lib_SOURCES += nanosleep.c
+endif
 
 Include:
 <time.h>
diff --git a/modules/nl_langinfo b/modules/nl_langinfo
index ee6717f3fc..3d014c91c2 100644
--- a/modules/nl_langinfo
+++ b/modules/nl_langinfo
@@ -16,16 +16,22 @@ setlocale-null  [test $HAVE_NL_LANGINFO = 0 || test $HAVE_LANGINFO_CODESET = 0]
 
 configure.ac:
 gl_FUNC_NL_LANGINFO
-if test $HAVE_NL_LANGINFO = 0 || test $REPLACE_NL_LANGINFO = 1; then
-  AC_LIBOBJ([nl_langinfo])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_NL_LANGINFO],
+               [test $HAVE_NL_LANGINFO = 0 || test $REPLACE_NL_LANGINFO = 1])
+gl_CONDITIONAL([GL_COND_OBJ_NL_LANGINFO_LOCK],
+               [test $REPLACE_NL_LANGINFO = 1 && test $NL_LANGINFO_MTSAFE = 0])
 if test $REPLACE_NL_LANGINFO = 1 && test $NL_LANGINFO_MTSAFE = 0; then
-  AC_LIBOBJ([nl_langinfo-lock])
   gl_PREREQ_NL_LANGINFO_LOCK
 fi
 gl_LANGINFO_MODULE_INDICATOR([nl_langinfo])
 
 Makefile.am:
+if GL_COND_OBJ_NL_LANGINFO
+lib_SOURCES += nl_langinfo.c
+endif
+if GL_COND_OBJ_NL_LANGINFO_LOCK
+lib_SOURCES += nl_langinfo-lock.c
+endif
 
 Include:
 <langinfo.h>
diff --git a/modules/obstack b/modules/obstack
index c8bb548a77..98bca67e1e 100644
--- a/modules/obstack
+++ b/modules/obstack
@@ -15,11 +15,12 @@ stdlib
 
 configure.ac:
 gl_FUNC_OBSTACK
-if test "$gl_cv_func_obstack" != yes; then
-  AC_LIBOBJ([obstack])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_OBSTACK], [test "$gl_cv_func_obstack" != yes])
 
 Makefile.am:
+if GL_COND_OBJ_OBSTACK
+lib_SOURCES += obstack.c
+endif
 
 Include:
 "obstack.h"
diff --git a/modules/open b/modules/open
index 91debfcbb2..f322b74794 100644
--- a/modules/open
+++ b/modules/open
@@ -17,13 +17,16 @@ stat            [test $REPLACE_OPEN = 1]
 
 configure.ac:
 gl_FUNC_OPEN
-if test $REPLACE_OPEN = 1; then
-  AC_LIBOBJ([open])
+gl_CONDITIONAL([GL_COND_OBJ_OPEN], [test $REPLACE_OPEN = 1])
+AM_COND_IF([GL_COND_OBJ_OPEN], [
   gl_PREREQ_OPEN
-fi
+])
 gl_FCNTL_MODULE_INDICATOR([open])
 
 Makefile.am:
+if GL_COND_OBJ_OPEN
+lib_SOURCES += open.c
+endif
 
 Include:
 <fcntl.h>
diff --git a/modules/openat b/modules/openat
index 5ff4e4d53b..ed020c1ac8 100644
--- a/modules/openat
+++ b/modules/openat
@@ -27,14 +27,18 @@ save-cwd        [test $HAVE_OPENAT = 0]
 
 configure.ac:
 gl_FUNC_OPENAT
-if test $HAVE_OPENAT = 0 || test $REPLACE_OPENAT = 1; then
-  AC_LIBOBJ([openat])
+gl_CONDITIONAL([GL_COND_OBJ_OPENAT],
+               [test $HAVE_OPENAT = 0 || test $REPLACE_OPENAT = 1])
+AM_COND_IF([GL_COND_OBJ_OPENAT], [
   gl_PREREQ_OPENAT
-fi
+])
 gl_MODULE_INDICATOR([openat]) dnl for lib/getcwd.c
 gl_FCNTL_MODULE_INDICATOR([openat])
 
 Makefile.am:
+if GL_COND_OBJ_OPENAT
+lib_SOURCES += openat.c
+endif
 
 Include:
 <fcntl.h>
diff --git a/modules/opendir b/modules/opendir
index 61be718498..e0334d31be 100644
--- a/modules/opendir
+++ b/modules/opendir
@@ -16,12 +16,14 @@ dirfd           [test $HAVE_OPENDIR = 0 || test $REPLACE_OPENDIR = 1]
 
 configure.ac:
 gl_FUNC_OPENDIR
-if test $HAVE_OPENDIR = 0 || test $REPLACE_OPENDIR = 1; then
-  AC_LIBOBJ([opendir])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_OPENDIR],
+               [test $HAVE_OPENDIR = 0 || test $REPLACE_OPENDIR = 1])
 gl_DIRENT_MODULE_INDICATOR([opendir])
 
 Makefile.am:
+if GL_COND_OBJ_OPENDIR
+lib_SOURCES += opendir.c
+endif
 
 Include:
 <dirent.h>
diff --git a/modules/openpty b/modules/openpty
index 8d174da7cb..a5f5cf84dd 100644
--- a/modules/openpty
+++ b/modules/openpty
@@ -14,12 +14,14 @@ ioctl           [test $HAVE_OPENPTY = 0 || test $REPLACE_OPENPTY = 1]
 
 configure.ac:
 gl_FUNC_OPENPTY
-if test $HAVE_OPENPTY = 0 || test $REPLACE_OPENPTY = 1; then
-  AC_LIBOBJ([openpty])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_OPENPTY],
+               [test $HAVE_OPENPTY = 0 || test $REPLACE_OPENPTY = 1])
 gl_PTY_MODULE_INDICATOR([openpty])
 
 Makefile.am:
+if GL_COND_OBJ_OPENPTY
+lib_SOURCES += openpty.c
+endif
 
 Include:
 <pty.h>
diff --git a/modules/pclose b/modules/pclose
index b55ab970c8..e5ec82f767 100644
--- a/modules/pclose
+++ b/modules/pclose
@@ -10,13 +10,16 @@ stdio
 
 configure.ac:
 gl_FUNC_PCLOSE
-if test $HAVE_PCLOSE = 0; then
-  AC_LIBOBJ([pclose])
+gl_CONDITIONAL([GL_COND_OBJ_PCLOSE], [test $HAVE_PCLOSE = 0])
+AM_COND_IF([GL_COND_OBJ_PCLOSE], [
   gl_PREREQ_PCLOSE
-fi
+])
 gl_STDIO_MODULE_INDICATOR([pclose])
 
 Makefile.am:
+if GL_COND_OBJ_PCLOSE
+lib_SOURCES += pclose.c
+endif
 
 Include:
 <stdio.h>
diff --git a/modules/perror b/modules/perror
index 8bc9d46b9f..14c5780444 100644
--- a/modules/perror
+++ b/modules/perror
@@ -13,12 +13,13 @@ strerror_r-posix [test $REPLACE_PERROR = 1]
 
 configure.ac:
 gl_FUNC_PERROR
-if test $REPLACE_PERROR = 1; then
-  AC_LIBOBJ([perror])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_PERROR], [test $REPLACE_PERROR = 1])
 gl_STRING_MODULE_INDICATOR([perror])
 
 Makefile.am:
+if GL_COND_OBJ_PERROR
+lib_SOURCES += perror.c
+endif
 
 Include:
 <stdio.h>
diff --git a/modules/pipe-posix b/modules/pipe-posix
index e8520d03c8..aaf19c2bf1 100644
--- a/modules/pipe-posix
+++ b/modules/pipe-posix
@@ -10,12 +10,13 @@ unistd
 
 configure.ac:
 gl_FUNC_PIPE
-if test $HAVE_PIPE = 0; then
-  AC_LIBOBJ([pipe])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_PIPE], [test $HAVE_PIPE = 0])
 gl_UNISTD_MODULE_INDICATOR([pipe])
 
 Makefile.am:
+if GL_COND_OBJ_PIPE
+lib_SOURCES += pipe.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/poll b/modules/poll
index 57f0631e72..f626c5e2c6 100644
--- a/modules/poll
+++ b/modules/poll
@@ -19,13 +19,17 @@ msvc-nothrow    [test $HAVE_POLL = 0 || test $REPLACE_POLL = 1]
 
 configure.ac:
 gl_FUNC_POLL
-if test $HAVE_POLL = 0 || test $REPLACE_POLL = 1; then
-  AC_LIBOBJ([poll])
+gl_CONDITIONAL([GL_COND_OBJ_POLL],
+               [test $HAVE_POLL = 0 || test $REPLACE_POLL = 1])
+AM_COND_IF([GL_COND_OBJ_POLL], [
   gl_PREREQ_POLL
-fi
+])
 gl_POLL_MODULE_INDICATOR([poll])
 
 Makefile.am:
+if GL_COND_OBJ_POLL
+lib_SOURCES += poll.c
+endif
 
 Include:
 <poll.h>
diff --git a/modules/popen b/modules/popen
index eb4102978a..6dbb4f3ed6 100644
--- a/modules/popen
+++ b/modules/popen
@@ -11,13 +11,17 @@ open            [test $HAVE_POPEN = 0 || test $REPLACE_POPEN = 1]
 
 configure.ac:
 gl_FUNC_POPEN
-if test $HAVE_POPEN = 0 || test $REPLACE_POPEN = 1; then
-  AC_LIBOBJ([popen])
+gl_CONDITIONAL([GL_COND_OBJ_POPEN],
+               [test $HAVE_POPEN = 0 || test $REPLACE_POPEN = 1])
+AM_COND_IF([GL_COND_OBJ_POPEN], [
   gl_PREREQ_POPEN
-fi
+])
 gl_STDIO_MODULE_INDICATOR([popen])
 
 Makefile.am:
+if GL_COND_OBJ_POPEN
+lib_SOURCES += popen.c
+endif
 
 Include:
 <stdio.h>
diff --git a/modules/posix_memalign b/modules/posix_memalign
index 86e8a52787..0bcdf18414 100644
--- a/modules/posix_memalign
+++ b/modules/posix_memalign
@@ -11,12 +11,13 @@ stdlib
 
 configure.ac:
 gl_FUNC_POSIX_MEMALIGN
-if test $REPLACE_POSIX_MEMALIGN = 1; then
-  AC_LIBOBJ([posix_memalign])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_POSIX_MEMALIGN], [test $REPLACE_POSIX_MEMALIGN = 1])
 gl_STDLIB_MODULE_INDICATOR([posix_memalign])
 
 Makefile.am:
+if GL_COND_OBJ_POSIX_MEMALIGN
+lib_SOURCES += posix_memalign.c
+endif
 
 Include:
 <stdlib.h>
diff --git a/modules/posix_openpt b/modules/posix_openpt
index 5bef9e27a7..96a4229879 100644
--- a/modules/posix_openpt
+++ b/modules/posix_openpt
@@ -11,12 +11,13 @@ stdlib
 
 configure.ac:
 gl_FUNC_POSIX_OPENPT
-if test $HAVE_POSIX_OPENPT = 0; then
-  AC_LIBOBJ([posix_openpt])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_POSIX_OPENPT], [test $HAVE_POSIX_OPENPT = 0])
 gl_STDLIB_MODULE_INDICATOR([posix_openpt])
 
 Makefile.am:
+if GL_COND_OBJ_POSIX_OPENPT
+lib_SOURCES += posix_openpt.c
+endif
 
 Include:
 <stdlib.h>
diff --git a/modules/posix_spawn b/modules/posix_spawn
index 3e2dce7591..b150aab643 100644
--- a/modules/posix_spawn
+++ b/modules/posix_spawn
@@ -11,12 +11,14 @@ posix_spawn-internal [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN =
 
 configure.ac:
 gl_POSIX_SPAWN
-if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
-  AC_LIBOBJ([spawn])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_SPAWN],
+               [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1])
 gl_SPAWN_MODULE_INDICATOR([posix_spawn])
 
 Makefile.am:
+if GL_COND_OBJ_SPAWN
+lib_SOURCES += spawn.c
+endif
 
 Include:
 <spawn.h>
diff --git a/modules/posix_spawn-internal b/modules/posix_spawn-internal
index f0f5cd107d..9dfe24cc66 100644
--- a/modules/posix_spawn-internal
+++ b/modules/posix_spawn-internal
@@ -24,12 +24,16 @@ windows-spawn   [test $HAVE_POSIX_SPAWN = 0]
 
 configure.ac:
 gl_POSIX_SPAWN
-if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
-  AC_LIBOBJ([spawni])
+gl_CONDITIONAL([GL_COND_OBJ_SPAWNI],
+               [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1])
+AM_COND_IF([GL_COND_OBJ_SPAWNI], [
   gl_PREREQ_POSIX_SPAWN_INTERNAL
-fi
+])
 
 Makefile.am:
+if GL_COND_OBJ_SPAWNI
+lib_SOURCES += spawni.c
+endif
 
 Include:
 
diff --git a/modules/posix_spawn_file_actions_addchdir b/modules/posix_spawn_file_actions_addchdir
index ad09334fa4..8f02bb5f27 100644
--- a/modules/posix_spawn_file_actions_addchdir
+++ b/modules/posix_spawn_file_actions_addchdir
@@ -13,12 +13,14 @@ posix_spawn_file_actions_init [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX
 
 configure.ac:
 gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR
-if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1 || test $HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR = 0 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR = 1; then
-  AC_LIBOBJ([spawn_faction_addchdir])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_SPAWN_FACTION_ADDCHDIR],
+               [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1 || test $HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR = 0 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR = 1])
 gl_SPAWN_MODULE_INDICATOR([posix_spawn_file_actions_addchdir])
 
 Makefile.am:
+if GL_COND_OBJ_SPAWN_FACTION_ADDCHDIR
+lib_SOURCES += spawn_faction_addchdir.c
+endif
 
 Include:
 <spawn.h>
diff --git a/modules/posix_spawn_file_actions_addclose b/modules/posix_spawn_file_actions_addclose
index 27d6d8e161..53a3b232a6 100644
--- a/modules/posix_spawn_file_actions_addclose
+++ b/modules/posix_spawn_file_actions_addclose
@@ -14,12 +14,14 @@ posix_spawn_file_actions_init [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX
 
 configure.ac:
 gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE
-if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = 1; then
-  AC_LIBOBJ([spawn_faction_addclose])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_SPAWN_FACTION_ADDCLOSE],
+               [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = 1])
 gl_SPAWN_MODULE_INDICATOR([posix_spawn_file_actions_addclose])
 
 Makefile.am:
+if GL_COND_OBJ_SPAWN_FACTION_ADDCLOSE
+lib_SOURCES += spawn_faction_addclose.c
+endif
 
 Include:
 <spawn.h>
diff --git a/modules/posix_spawn_file_actions_adddup2 b/modules/posix_spawn_file_actions_adddup2
index 361ccb858a..367a751949 100644
--- a/modules/posix_spawn_file_actions_adddup2
+++ b/modules/posix_spawn_file_actions_adddup2
@@ -14,12 +14,14 @@ posix_spawn_file_actions_init [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX
 
 configure.ac:
 gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2
-if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = 1; then
-  AC_LIBOBJ([spawn_faction_adddup2])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_SPAWN_FACTION_ADDDUP2],
+               [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = 1])
 gl_SPAWN_MODULE_INDICATOR([posix_spawn_file_actions_adddup2])
 
 Makefile.am:
+if GL_COND_OBJ_SPAWN_FACTION_ADDDUP2
+lib_SOURCES += spawn_faction_adddup2.c
+endif
 
 Include:
 <spawn.h>
diff --git a/modules/posix_spawn_file_actions_addfchdir b/modules/posix_spawn_file_actions_addfchdir
index cd9cb99f2f..4f15fdf2df 100644
--- a/modules/posix_spawn_file_actions_addfchdir
+++ b/modules/posix_spawn_file_actions_addfchdir
@@ -13,12 +13,14 @@ posix_spawn_file_actions_init [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX
 
 configure.ac:
 gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR
-if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1 || test $HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR = 0 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR = 1; then
-  AC_LIBOBJ([spawn_faction_addfchdir])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_SPAWN_FACTION_ADDFCHDIR],
+               [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1 || test $HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR = 0 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR = 1])
 gl_SPAWN_MODULE_INDICATOR([posix_spawn_file_actions_addfchdir])
 
 Makefile.am:
+if GL_COND_OBJ_SPAWN_FACTION_ADDFCHDIR
+lib_SOURCES += spawn_faction_addfchdir.c
+endif
 
 Include:
 <spawn.h>
diff --git a/modules/posix_spawn_file_actions_addopen b/modules/posix_spawn_file_actions_addopen
index b4ee0da99c..18b547768a 100644
--- a/modules/posix_spawn_file_actions_addopen
+++ b/modules/posix_spawn_file_actions_addopen
@@ -14,12 +14,14 @@ posix_spawn_file_actions_init [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX
 
 configure.ac:
 gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN
-if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = 1; then
-  AC_LIBOBJ([spawn_faction_addopen])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_SPAWN_FACTION_ADDOPEN],
+               [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = 1])
 gl_SPAWN_MODULE_INDICATOR([posix_spawn_file_actions_addopen])
 
 Makefile.am:
+if GL_COND_OBJ_SPAWN_FACTION_ADDOPEN
+lib_SOURCES += spawn_faction_addopen.c
+endif
 
 Include:
 <spawn.h>
diff --git a/modules/posix_spawn_file_actions_destroy b/modules/posix_spawn_file_actions_destroy
index 294a5eff56..d0a3e42ffb 100644
--- a/modules/posix_spawn_file_actions_destroy
+++ b/modules/posix_spawn_file_actions_destroy
@@ -11,12 +11,14 @@ spawn
 
 configure.ac:
 gl_POSIX_SPAWN
-if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
-  AC_LIBOBJ([spawn_faction_destroy])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_SPAWN_FACTION_DESTROY],
+               [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1])
 gl_SPAWN_MODULE_INDICATOR([posix_spawn_file_actions_destroy])
 
 Makefile.am:
+if GL_COND_OBJ_SPAWN_FACTION_DESTROY
+lib_SOURCES += spawn_faction_destroy.c
+endif
 
 Include:
 <spawn.h>
diff --git a/modules/posix_spawn_file_actions_init b/modules/posix_spawn_file_actions_init
index 023969c3f7..1b9a87dc17 100644
--- a/modules/posix_spawn_file_actions_init
+++ b/modules/posix_spawn_file_actions_init
@@ -12,12 +12,14 @@ spawn
 
 configure.ac:
 gl_POSIX_SPAWN
-if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
-  AC_LIBOBJ([spawn_faction_init])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_SPAWN_FACTION_INIT],
+               [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1])
 gl_SPAWN_MODULE_INDICATOR([posix_spawn_file_actions_init])
 
 Makefile.am:
+if GL_COND_OBJ_SPAWN_FACTION_INIT
+lib_SOURCES += spawn_faction_init.c
+endif
 
 Include:
 <spawn.h>
diff --git a/modules/posix_spawnattr_destroy b/modules/posix_spawnattr_destroy
index 06d28bcc77..751981b1ca 100644
--- a/modules/posix_spawnattr_destroy
+++ b/modules/posix_spawnattr_destroy
@@ -11,12 +11,14 @@ spawn
 
 configure.ac:
 gl_POSIX_SPAWN
-if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
-  AC_LIBOBJ([spawnattr_destroy])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_SPAWNATTR_DESTROY],
+               [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1])
 gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_destroy])
 
 Makefile.am:
+if GL_COND_OBJ_SPAWNATTR_DESTROY
+lib_SOURCES += spawnattr_destroy.c
+endif
 
 Include:
 <spawn.h>
diff --git a/modules/posix_spawnattr_getflags b/modules/posix_spawnattr_getflags
index ec8c020683..8cbbfcc1e2 100644
--- a/modules/posix_spawnattr_getflags
+++ b/modules/posix_spawnattr_getflags
@@ -11,12 +11,14 @@ spawn
 
 configure.ac:
 gl_POSIX_SPAWN
-if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
-  AC_LIBOBJ([spawnattr_getflags])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_SPAWNATTR_GETFLAGS],
+               [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1])
 gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_getflags])
 
 Makefile.am:
+if GL_COND_OBJ_SPAWNATTR_GETFLAGS
+lib_SOURCES += spawnattr_getflags.c
+endif
 
 Include:
 <spawn.h>
diff --git a/modules/posix_spawnattr_getpgroup b/modules/posix_spawnattr_getpgroup
index 38786ad546..9738eec832 100644
--- a/modules/posix_spawnattr_getpgroup
+++ b/modules/posix_spawnattr_getpgroup
@@ -11,12 +11,14 @@ spawn
 
 configure.ac:
 gl_POSIX_SPAWN
-if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
-  AC_LIBOBJ([spawnattr_getpgroup])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_SPAWNATTR_GETPGROUP],
+               [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1])
 gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_getpgroup])
 
 Makefile.am:
+if GL_COND_OBJ_SPAWNATTR_GETPGROUP
+lib_SOURCES += spawnattr_getpgroup.c
+endif
 
 Include:
 <spawn.h>
diff --git a/modules/posix_spawnattr_getschedparam b/modules/posix_spawnattr_getschedparam
index 4aaa7938c2..3a2ba00a1d 100644
--- a/modules/posix_spawnattr_getschedparam
+++ b/modules/posix_spawnattr_getschedparam
@@ -11,14 +11,14 @@ spawn
 
 configure.ac:
 gl_POSIX_SPAWN
-if test $HAVE_POSIX_SPAWN = 0 \
-   || test $REPLACE_POSIX_SPAWN = 1 \
-   || test $gl_cv_func_spawnattr_setschedparam = no; then
-  AC_LIBOBJ([spawnattr_getschedparam])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_SPAWNATTR_GETSCHEDPARAM],
+               [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1 || test $gl_cv_func_spawnattr_setschedparam = no])
 gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_getschedparam])
 
 Makefile.am:
+if GL_COND_OBJ_SPAWNATTR_GETSCHEDPARAM
+lib_SOURCES += spawnattr_getschedparam.c
+endif
 
 Include:
 <spawn.h>
diff --git a/modules/posix_spawnattr_getschedpolicy b/modules/posix_spawnattr_getschedpolicy
index bfd71dc182..a09fe7eb76 100644
--- a/modules/posix_spawnattr_getschedpolicy
+++ b/modules/posix_spawnattr_getschedpolicy
@@ -11,14 +11,14 @@ spawn
 
 configure.ac:
 gl_POSIX_SPAWN
-if test $HAVE_POSIX_SPAWN = 0 \
-   || test $REPLACE_POSIX_SPAWN = 1 \
-   || test $gl_cv_func_spawnattr_setschedpolicy = no; then
-  AC_LIBOBJ([spawnattr_getschedpolicy])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_SPAWNATTR_GETSCHEDPOLICY],
+               [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1 || test $gl_cv_func_spawnattr_setschedpolicy = no])
 gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_getschedpolicy])
 
 Makefile.am:
+if GL_COND_OBJ_SPAWNATTR_GETSCHEDPOLICY
+lib_SOURCES += spawnattr_getschedpolicy.c
+endif
 
 Include:
 <spawn.h>
diff --git a/modules/posix_spawnattr_getsigdefault b/modules/posix_spawnattr_getsigdefault
index e56209bb67..a9672e241c 100644
--- a/modules/posix_spawnattr_getsigdefault
+++ b/modules/posix_spawnattr_getsigdefault
@@ -11,12 +11,14 @@ spawn
 
 configure.ac:
 gl_POSIX_SPAWN
-if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
-  AC_LIBOBJ([spawnattr_getdefault])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_SPAWNATTR_GETDEFAULT],
+               [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1])
 gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_getsigdefault])
 
 Makefile.am:
+if GL_COND_OBJ_SPAWNATTR_GETDEFAULT
+lib_SOURCES += spawnattr_getdefault.c
+endif
 
 Include:
 <spawn.h>
diff --git a/modules/posix_spawnattr_getsigmask b/modules/posix_spawnattr_getsigmask
index eed44e9efb..608127f299 100644
--- a/modules/posix_spawnattr_getsigmask
+++ b/modules/posix_spawnattr_getsigmask
@@ -11,12 +11,14 @@ spawn
 
 configure.ac:
 gl_POSIX_SPAWN
-if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
-  AC_LIBOBJ([spawnattr_getsigmask])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_SPAWNATTR_GETSIGMASK],
+               [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1])
 gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_getsigmask])
 
 Makefile.am:
+if GL_COND_OBJ_SPAWNATTR_GETSIGMASK
+lib_SOURCES += spawnattr_getsigmask.c
+endif
 
 Include:
 <spawn.h>
diff --git a/modules/posix_spawnattr_init b/modules/posix_spawnattr_init
index c0f2ade662..d564b73e59 100644
--- a/modules/posix_spawnattr_init
+++ b/modules/posix_spawnattr_init
@@ -11,12 +11,14 @@ spawn
 
 configure.ac:
 gl_POSIX_SPAWN
-if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
-  AC_LIBOBJ([spawnattr_init])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_SPAWNATTR_INIT],
+               [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1])
 gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_init])
 
 Makefile.am:
+if GL_COND_OBJ_SPAWNATTR_INIT
+lib_SOURCES += spawnattr_init.c
+endif
 
 Include:
 <spawn.h>
diff --git a/modules/posix_spawnattr_setflags b/modules/posix_spawnattr_setflags
index 6bb66c1150..9b01359061 100644
--- a/modules/posix_spawnattr_setflags
+++ b/modules/posix_spawnattr_setflags
@@ -11,12 +11,14 @@ spawn
 
 configure.ac:
 gl_POSIX_SPAWN
-if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
-  AC_LIBOBJ([spawnattr_setflags])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_SPAWNATTR_SETFLAGS],
+               [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1])
 gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_setflags])
 
 Makefile.am:
+if GL_COND_OBJ_SPAWNATTR_SETFLAGS
+lib_SOURCES += spawnattr_setflags.c
+endif
 
 Include:
 <spawn.h>
diff --git a/modules/posix_spawnattr_setpgroup b/modules/posix_spawnattr_setpgroup
index f774d31db6..70f78684c1 100644
--- a/modules/posix_spawnattr_setpgroup
+++ b/modules/posix_spawnattr_setpgroup
@@ -10,12 +10,14 @@ spawn
 
 configure.ac:
 gl_POSIX_SPAWN
-if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
-  AC_LIBOBJ([spawnattr_setpgroup])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_SPAWNATTR_SETPGROUP],
+               [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1])
 gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_setpgroup])
 
 Makefile.am:
+if GL_COND_OBJ_SPAWNATTR_SETPGROUP
+lib_SOURCES += spawnattr_setpgroup.c
+endif
 
 Include:
 <spawn.h>
diff --git a/modules/posix_spawnattr_setschedparam b/modules/posix_spawnattr_setschedparam
index f7a5c8b243..3bb0ff7248 100644
--- a/modules/posix_spawnattr_setschedparam
+++ b/modules/posix_spawnattr_setschedparam
@@ -11,14 +11,14 @@ spawn
 
 configure.ac:
 gl_POSIX_SPAWN
-if test $HAVE_POSIX_SPAWN = 0 \
-   || test $REPLACE_POSIX_SPAWN = 1 \
-   || test $gl_cv_func_spawnattr_setschedparam = no; then
-  AC_LIBOBJ([spawnattr_setschedparam])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_SPAWNATTR_SETSCHEDPARAM],
+               [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1 || test $gl_cv_func_spawnattr_setschedparam = no])
 gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_setschedparam])
 
 Makefile.am:
+if GL_COND_OBJ_SPAWNATTR_SETSCHEDPARAM
+lib_SOURCES += spawnattr_setschedparam.c
+endif
 
 Include:
 <spawn.h>
diff --git a/modules/posix_spawnattr_setschedpolicy b/modules/posix_spawnattr_setschedpolicy
index 93b26ea711..d6944e2344 100644
--- a/modules/posix_spawnattr_setschedpolicy
+++ b/modules/posix_spawnattr_setschedpolicy
@@ -11,14 +11,14 @@ spawn
 
 configure.ac:
 gl_POSIX_SPAWN
-if test $HAVE_POSIX_SPAWN = 0 \
-   || test $REPLACE_POSIX_SPAWN = 1 \
-   || test $gl_cv_func_spawnattr_setschedpolicy = no; then
-  AC_LIBOBJ([spawnattr_setschedpolicy])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_SPAWNATTR_SETSCHEDPOLICY],
+               [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1 || test $gl_cv_func_spawnattr_setschedpolicy = no])
 gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_setschedpolicy])
 
 Makefile.am:
+if GL_COND_OBJ_SPAWNATTR_SETSCHEDPOLICY
+lib_SOURCES += spawnattr_setschedpolicy.c
+endif
 
 Include:
 <spawn.h>
diff --git a/modules/posix_spawnattr_setsigdefault b/modules/posix_spawnattr_setsigdefault
index 77351fb795..e6aa9dd37c 100644
--- a/modules/posix_spawnattr_setsigdefault
+++ b/modules/posix_spawnattr_setsigdefault
@@ -11,12 +11,14 @@ spawn
 
 configure.ac:
 gl_POSIX_SPAWN
-if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
-  AC_LIBOBJ([spawnattr_setdefault])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_SPAWNATTR_SETDEFAULT],
+               [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1])
 gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_setsigdefault])
 
 Makefile.am:
+if GL_COND_OBJ_SPAWNATTR_SETDEFAULT
+lib_SOURCES += spawnattr_setdefault.c
+endif
 
 Include:
 <spawn.h>
diff --git a/modules/posix_spawnattr_setsigmask b/modules/posix_spawnattr_setsigmask
index 793b5d52e4..2f0b3f4a30 100644
--- a/modules/posix_spawnattr_setsigmask
+++ b/modules/posix_spawnattr_setsigmask
@@ -11,12 +11,14 @@ spawn
 
 configure.ac:
 gl_POSIX_SPAWN
-if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
-  AC_LIBOBJ([spawnattr_setsigmask])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_SPAWNATTR_SETSIGMASK],
+               [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1])
 gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_setsigmask])
 
 Makefile.am:
+if GL_COND_OBJ_SPAWNATTR_SETSIGMASK
+lib_SOURCES += spawnattr_setsigmask.c
+endif
 
 Include:
 <spawn.h>
diff --git a/modules/posix_spawnp b/modules/posix_spawnp
index 957a144767..3cd0721287 100644
--- a/modules/posix_spawnp
+++ b/modules/posix_spawnp
@@ -11,12 +11,14 @@ posix_spawn-internal [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN =
 
 configure.ac:
 gl_POSIX_SPAWN
-if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
-  AC_LIBOBJ([spawnp])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_SPAWNP],
+               [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1])
 gl_SPAWN_MODULE_INDICATOR([posix_spawnp])
 
 Makefile.am:
+if GL_COND_OBJ_SPAWNP
+lib_SOURCES += spawnp.c
+endif
 
 Include:
 <spawn.h>
diff --git a/modules/powf b/modules/powf
index 6cbdc4cd7b..548d488faa 100644
--- a/modules/powf
+++ b/modules/powf
@@ -12,12 +12,13 @@ pow             [test $HAVE_POWF = 0]
 
 configure.ac:
 gl_FUNC_POWF
-if test $HAVE_POWF = 0; then
-  AC_LIBOBJ([powf])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_POWF], [test $HAVE_POWF = 0])
 gl_MATH_MODULE_INDICATOR([powf])
 
 Makefile.am:
+if GL_COND_OBJ_POWF
+lib_SOURCES += powf.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/pread b/modules/pread
index 7281cd6ad4..3494cd8d9e 100644
--- a/modules/pread
+++ b/modules/pread
@@ -14,12 +14,14 @@ read            [test $HAVE_PREAD = 0 || test $REPLACE_PREAD = 1]
 
 configure.ac:
 gl_FUNC_PREAD
-if test $HAVE_PREAD = 0 || test $REPLACE_PREAD = 1; then
-  AC_LIBOBJ([pread])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_PREAD],
+               [test $HAVE_PREAD = 0 || test $REPLACE_PREAD = 1])
 gl_UNISTD_MODULE_INDICATOR([pread])
 
 Makefile.am:
+if GL_COND_OBJ_PREAD
+lib_SOURCES += pread.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/pselect b/modules/pselect
index 0c2bbeb422..207ec76c8a 100644
--- a/modules/pselect
+++ b/modules/pselect
@@ -13,12 +13,14 @@ dup2            [test $REPLACE_PSELECT = 1]
 
 configure.ac:
 gl_FUNC_PSELECT
-if test $HAVE_PSELECT = 0 || test $REPLACE_PSELECT = 1; then
-  AC_LIBOBJ([pselect])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_PSELECT],
+               [test $HAVE_PSELECT = 0 || test $REPLACE_PSELECT = 1])
 gl_SYS_SELECT_MODULE_INDICATOR([pselect])
 
 Makefile.am:
+if GL_COND_OBJ_PSELECT
+lib_SOURCES += pselect.c
+endif
 
 Include:
 <sys/select.h>
diff --git a/modules/pthread-cond b/modules/pthread-cond
index e5c62fe188..384bdbe6ea 100644
--- a/modules/pthread-cond
+++ b/modules/pthread-cond
@@ -12,12 +12,14 @@ pthread-mutex   [test $gl_threads_api = windows]
 
 configure.ac:
 gl_PTHREAD_COND
-if test $HAVE_PTHREAD_COND_INIT = 0 || test $REPLACE_PTHREAD_COND_INIT = 1; then
-  AC_LIBOBJ([pthread-cond])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_PTHREAD_COND],
+               [test $HAVE_PTHREAD_COND_INIT = 0 || test $REPLACE_PTHREAD_COND_INIT = 1])
 gl_PTHREAD_MODULE_INDICATOR([pthread-cond])
 
 Makefile.am:
+if GL_COND_OBJ_PTHREAD_COND
+lib_SOURCES += pthread-cond.c
+endif
 
 Include:
 <pthread.h>
diff --git a/modules/pthread-mutex b/modules/pthread-mutex
index 9fdd2fecbf..78029dd249 100644
--- a/modules/pthread-mutex
+++ b/modules/pthread-mutex
@@ -13,13 +13,14 @@ windows-timedrecmutex   [test $gl_threads_api = windows]
 
 configure.ac:
 gl_PTHREAD_MUTEX
-if test $HAVE_PTHREAD_MUTEX_INIT = 0 || test $REPLACE_PTHREAD_MUTEX_INIT = 1 \
-   || test $HAVE_PTHREAD_MUTEXATTR_GETROBUST = 0 || test $REPLACE_PTHREAD_MUTEXATTR_GETROBUST = 1; then
-  AC_LIBOBJ([pthread-mutex])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_PTHREAD_MUTEX],
+               [test $HAVE_PTHREAD_MUTEX_INIT = 0 || test $REPLACE_PTHREAD_MUTEX_INIT = 1 || test $HAVE_PTHREAD_MUTEXATTR_GETROBUST = 0 || test $REPLACE_PTHREAD_MUTEXATTR_GETROBUST = 1])
 gl_PTHREAD_MODULE_INDICATOR([pthread-mutex])
 
 Makefile.am:
+if GL_COND_OBJ_PTHREAD_MUTEX
+lib_SOURCES += pthread-mutex.c
+endif
 
 Include:
 <pthread.h>
diff --git a/modules/pthread-once b/modules/pthread-once
index c7f28d1aff..3e6ab5f93b 100644
--- a/modules/pthread-once
+++ b/modules/pthread-once
@@ -11,12 +11,14 @@ windows-once    [test $gl_threads_api = windows]
 
 configure.ac:
 gl_PTHREAD_ONCE
-if test $HAVE_PTHREAD_ONCE = 0 || test $REPLACE_PTHREAD_ONCE = 1; then
-  AC_LIBOBJ([pthread-once])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_PTHREAD_ONCE],
+               [test $HAVE_PTHREAD_ONCE = 0 || test $REPLACE_PTHREAD_ONCE = 1])
 gl_PTHREAD_MODULE_INDICATOR([pthread-once])
 
 Makefile.am:
+if GL_COND_OBJ_PTHREAD_ONCE
+lib_SOURCES += pthread-once.c
+endif
 
 Include:
 <pthread.h>
diff --git a/modules/pthread-rwlock b/modules/pthread-rwlock
index 4944edd81f..9f63b74a4d 100644
--- a/modules/pthread-rwlock
+++ b/modules/pthread-rwlock
@@ -13,12 +13,14 @@ windows-timedrwlock [test $gl_threads_api = windows]
 
 configure.ac:
 gl_PTHREAD_RWLOCK
-if test $HAVE_PTHREAD_RWLOCK_TIMEDRDLOCK = 0 || test $REPLACE_PTHREAD_RWLOCK_TIMEDRDLOCK = 1; then
-  AC_LIBOBJ([pthread-rwlock])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_PTHREAD_RWLOCK],
+               [test $HAVE_PTHREAD_RWLOCK_TIMEDRDLOCK = 0 || test $REPLACE_PTHREAD_RWLOCK_TIMEDRDLOCK = 1])
 gl_PTHREAD_MODULE_INDICATOR([pthread-rwlock])
 
 Makefile.am:
+if GL_COND_OBJ_PTHREAD_RWLOCK
+lib_SOURCES += pthread-rwlock.c
+endif
 
 Include:
 <pthread.h>
diff --git a/modules/pthread-spin b/modules/pthread-spin
index ce69944021..35e3aa701e 100644
--- a/modules/pthread-spin
+++ b/modules/pthread-spin
@@ -12,12 +12,14 @@ windows-spin    [test $gl_threads_api = windows]
 
 configure.ac:
 gl_PTHREAD_SPIN
-if test $HAVE_PTHREAD_SPIN_INIT = 0 || test $REPLACE_PTHREAD_SPIN_INIT = 1; then
-  AC_LIBOBJ([pthread-spin])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_PTHREAD_SPIN],
+               [test $HAVE_PTHREAD_SPIN_INIT = 0 || test $REPLACE_PTHREAD_SPIN_INIT = 1])
 gl_PTHREAD_MODULE_INDICATOR([pthread-spin])
 
 Makefile.am:
+if GL_COND_OBJ_PTHREAD_SPIN
+lib_SOURCES += pthread-spin.c
+endif
 
 Include:
 <pthread.h>
diff --git a/modules/pthread-thread b/modules/pthread-thread
index af6682b8ea..7ea324c9e4 100644
--- a/modules/pthread-thread
+++ b/modules/pthread-thread
@@ -11,12 +11,14 @@ windows-thread  [test $gl_threads_api = windows]
 
 configure.ac:
 gl_PTHREAD_THREAD
-if test $HAVE_PTHREAD_CREATE = 0 || test $REPLACE_PTHREAD_CREATE = 1; then
-  AC_LIBOBJ([pthread-thread])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_PTHREAD_THREAD],
+               [test $HAVE_PTHREAD_CREATE = 0 || test $REPLACE_PTHREAD_CREATE = 1])
 gl_PTHREAD_MODULE_INDICATOR([pthread-thread])
 
 Makefile.am:
+if GL_COND_OBJ_PTHREAD_THREAD
+lib_SOURCES += pthread-thread.c
+endif
 
 Include:
 <pthread.h>
diff --git a/modules/pthread-tss b/modules/pthread-tss
index ab95d08a1b..f830253cf4 100644
--- a/modules/pthread-tss
+++ b/modules/pthread-tss
@@ -11,12 +11,14 @@ windows-tls     [test $gl_threads_api = windows]
 
 configure.ac:
 gl_PTHREAD_TSS
-if test $HAVE_PTHREAD_KEY_CREATE = 0 || test $REPLACE_PTHREAD_KEY_CREATE = 1; then
-  AC_LIBOBJ([pthread-tss])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_PTHREAD_TSS],
+               [test $HAVE_PTHREAD_KEY_CREATE = 0 || test $REPLACE_PTHREAD_KEY_CREATE = 1])
 gl_PTHREAD_MODULE_INDICATOR([pthread-tss])
 
 Makefile.am:
+if GL_COND_OBJ_PTHREAD_TSS
+lib_SOURCES += pthread-tss.c
+endif
 
 Include:
 <pthread.h>
diff --git a/modules/pthread_mutex_timedlock b/modules/pthread_mutex_timedlock
index 4e01c30337..9929b41a75 100644
--- a/modules/pthread_mutex_timedlock
+++ b/modules/pthread_mutex_timedlock
@@ -11,12 +11,14 @@ nanosleep       [test $HAVE_PTHREAD_T = 1 && test $HAVE_PTHREAD_MUTEX_TIMEDLOCK
 
 configure.ac:
 gl_FUNC_PTHREAD_MUTEX_TIMEDLOCK
-if test $HAVE_PTHREAD_T = 1 && test $HAVE_PTHREAD_MUTEX_TIMEDLOCK = 0; then
-  AC_LIBOBJ([pthread_mutex_timedlock])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_PTHREAD_MUTEX_TIMEDLOCK],
+               [test $HAVE_PTHREAD_T = 1 && test $HAVE_PTHREAD_MUTEX_TIMEDLOCK = 0])
 gl_PTHREAD_MODULE_INDICATOR([pthread_mutex_timedlock])
 
 Makefile.am:
+if GL_COND_OBJ_PTHREAD_MUTEX_TIMEDLOCK
+lib_SOURCES += pthread_mutex_timedlock.c
+endif
 
 Include:
 <pthread.h>
diff --git a/modules/pthread_sigmask b/modules/pthread_sigmask
index ee1f13560a..a519d3df4c 100644
--- a/modules/pthread_sigmask
+++ b/modules/pthread_sigmask
@@ -12,13 +12,17 @@ sigprocmask     [test $HAVE_PTHREAD_SIGMASK = 0 || test $REPLACE_PTHREAD_SIGMASK
 
 configure.ac:
 gl_FUNC_PTHREAD_SIGMASK
-if test $HAVE_PTHREAD_SIGMASK = 0 || test $REPLACE_PTHREAD_SIGMASK = 1; then
-  AC_LIBOBJ([pthread_sigmask])
+gl_CONDITIONAL([GL_COND_OBJ_PTHREAD_SIGMASK],
+               [test $HAVE_PTHREAD_SIGMASK = 0 || test $REPLACE_PTHREAD_SIGMASK = 1])
+AM_COND_IF([GL_COND_OBJ_PTHREAD_SIGMASK], [
   gl_PREREQ_PTHREAD_SIGMASK
-fi
+])
 gl_SIGNAL_MODULE_INDICATOR([pthread_sigmask])
 
 Makefile.am:
+if GL_COND_OBJ_PTHREAD_SIGMASK
+lib_SOURCES += pthread_sigmask.c
+endif
 
 Include:
 <signal.h>
diff --git a/modules/ptsname b/modules/ptsname
index e135c5af89..4fbab87962 100644
--- a/modules/ptsname
+++ b/modules/ptsname
@@ -12,13 +12,17 @@ ptsname_r       [test $HAVE_PTSNAME = 0]
 
 configure.ac:
 gl_FUNC_PTSNAME
-if test $HAVE_PTSNAME = 0 || test $REPLACE_PTSNAME = 1; then
-  AC_LIBOBJ([ptsname])
+gl_CONDITIONAL([GL_COND_OBJ_PTSNAME],
+               [test $HAVE_PTSNAME = 0 || test $REPLACE_PTSNAME = 1])
+AM_COND_IF([GL_COND_OBJ_PTSNAME], [
   gl_PREREQ_PTSNAME
-fi
+])
 gl_STDLIB_MODULE_INDICATOR([ptsname])
 
 Makefile.am:
+if GL_COND_OBJ_PTSNAME
+lib_SOURCES += ptsname.c
+endif
 
 Include:
 <stdlib.h>
diff --git a/modules/ptsname_r b/modules/ptsname_r
index 9cd5703404..e29712d21f 100644
--- a/modules/ptsname_r
+++ b/modules/ptsname_r
@@ -14,13 +14,17 @@ ttyname_r       [test $HAVE_PTSNAME_R = 0 || test $REPLACE_PTSNAME_R = 1]
 
 configure.ac:
 gl_FUNC_PTSNAME_R
-if test $HAVE_PTSNAME_R = 0 || test $REPLACE_PTSNAME_R = 1; then
-  AC_LIBOBJ([ptsname_r])
+gl_CONDITIONAL([GL_COND_OBJ_PTSNAME_R],
+               [test $HAVE_PTSNAME_R = 0 || test $REPLACE_PTSNAME_R = 1])
+AM_COND_IF([GL_COND_OBJ_PTSNAME_R], [
   gl_PREREQ_PTSNAME_R
-fi
+])
 gl_STDLIB_MODULE_INDICATOR([ptsname_r])
 
 Makefile.am:
+if GL_COND_OBJ_PTSNAME_R
+lib_SOURCES += ptsname_r.c
+endif
 
 Include:
 <stdlib.h>
diff --git a/modules/putenv b/modules/putenv
index b14330ad87..a5a7c8d795 100644
--- a/modules/putenv
+++ b/modules/putenv
@@ -13,13 +13,16 @@ malloc-posix    [test $REPLACE_PUTENV = 1]
 
 configure.ac:
 gl_FUNC_PUTENV
-if test $REPLACE_PUTENV = 1; then
-  AC_LIBOBJ([putenv])
+gl_CONDITIONAL([GL_COND_OBJ_PUTENV], [test $REPLACE_PUTENV = 1])
+AM_COND_IF([GL_COND_OBJ_PUTENV], [
   gl_PREREQ_PUTENV
-fi
+])
 gl_STDLIB_MODULE_INDICATOR([putenv])
 
 Makefile.am:
+if GL_COND_OBJ_PUTENV
+lib_SOURCES += putenv.c
+endif
 
 Include:
 <stdlib.h>
diff --git a/modules/pwrite b/modules/pwrite
index 78843d4bc6..78e602f0e9 100644
--- a/modules/pwrite
+++ b/modules/pwrite
@@ -14,12 +14,14 @@ write           [test $HAVE_PWRITE = 0 || test $REPLACE_PWRITE = 1]
 
 configure.ac:
 gl_FUNC_PWRITE
-if test $HAVE_PWRITE = 0 || test $REPLACE_PWRITE = 1; then
-  AC_LIBOBJ([pwrite])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_PWRITE],
+               [test $HAVE_PWRITE = 0 || test $REPLACE_PWRITE = 1])
 gl_UNISTD_MODULE_INDICATOR([pwrite])
 
 Makefile.am:
+if GL_COND_OBJ_PWRITE
+lib_SOURCES += pwrite.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/qsort_r b/modules/qsort_r
index 6772edc467..8063078562 100644
--- a/modules/qsort_r
+++ b/modules/qsort_r
@@ -12,16 +12,20 @@ stdlib
 
 configure.ac:
 gl_FUNC_QSORT_R
-if test $HAVE_QSORT_R = 0; then
-  # The function is missing from the system or has an unknown signature.
-  AC_LIBOBJ([qsort])
-elif test $REPLACE_QSORT_R = 1; then
-  # The function exists, but it has the BSD signature.
-  AC_LIBOBJ([qsort_r])
-fi
+dnl If the function is missing from the system or has an unknown signature:
+gl_CONDITIONAL([GL_COND_OBJ_QSORT], [test $HAVE_QSORT_R = 0])
+dnl If the function exists, but it has the BSD signature:
+gl_CONDITIONAL([GL_COND_OBJ_QSORT_R],
+               [test $HAVE_QSORT_R = 1 && test $REPLACE_QSORT_R = 1])
 gl_STDLIB_MODULE_INDICATOR([qsort_r])
 
 Makefile.am:
+if GL_COND_OBJ_QSORT
+lib_SOURCES += qsort.c
+endif
+if GL_COND_OBJ_QSORT_R
+lib_SOURCES += qsort_r.c
+endif
 
 Include:
 <stdlib.h>
diff --git a/modules/raise b/modules/raise
index 4a6a8b589e..a308ea45d7 100644
--- a/modules/raise
+++ b/modules/raise
@@ -11,13 +11,17 @@ msvc-inval      [test $HAVE_RAISE = 0 || test $REPLACE_RAISE = 1]
 
 configure.ac:
 gl_FUNC_RAISE
-if test $HAVE_RAISE = 0 || test $REPLACE_RAISE = 1; then
-  AC_LIBOBJ([raise])
+gl_CONDITIONAL([GL_COND_OBJ_RAISE],
+               [test $HAVE_RAISE = 0 || test $REPLACE_RAISE = 1])
+AM_COND_IF([GL_COND_OBJ_RAISE], [
   gl_PREREQ_RAISE
-fi
+])
 gl_SIGNAL_MODULE_INDICATOR([raise])
 
 Makefile.am:
+if GL_COND_OBJ_RAISE
+lib_SOURCES += raise.c
+endif
 
 Include:
 <signal.h>
diff --git a/modules/random b/modules/random
index e58ebd18b5..a6ccbb777d 100644
--- a/modules/random
+++ b/modules/random
@@ -13,13 +13,17 @@ random_r        [test $HAVE_RANDOM = 0 || test $REPLACE_RANDOM = 1 || test $REPL
 
 configure.ac:
 gl_FUNC_RANDOM
-if test $HAVE_RANDOM = 0 || test $REPLACE_RANDOM = 1 || test $REPLACE_INITSTATE = 1 || test $REPLACE_SETSTATE = 1; then
-  AC_LIBOBJ([random])
+gl_CONDITIONAL([GL_COND_OBJ_RANDOM],
+               [test $HAVE_RANDOM = 0 || test $REPLACE_RANDOM = 1 || test $REPLACE_INITSTATE = 1 || test $REPLACE_SETSTATE = 1])
+AM_COND_IF([GL_COND_OBJ_RANDOM], [
   gl_PREREQ_RANDOM
-fi
+])
 gl_STDLIB_MODULE_INDICATOR([random])
 
 Makefile.am:
+if GL_COND_OBJ_RANDOM
+lib_SOURCES += random.c
+endif
 
 Include:
 <stdlib.h>
diff --git a/modules/random_r b/modules/random_r
index 6fa132497e..56c5a447e9 100644
--- a/modules/random_r
+++ b/modules/random_r
@@ -13,13 +13,17 @@ stdint          [test $HAVE_RANDOM_R = 0 || test $REPLACE_RANDOM_R = 1]
 
 configure.ac:
 gl_FUNC_RANDOM_R
-if test $HAVE_RANDOM_R = 0 || test $REPLACE_RANDOM_R = 1; then
-  AC_LIBOBJ([random_r])
+gl_CONDITIONAL([GL_COND_OBJ_RANDOM_R],
+               [test $HAVE_RANDOM_R = 0 || test $REPLACE_RANDOM_R = 1])
+AM_COND_IF([GL_COND_OBJ_RANDOM_R], [
   gl_PREREQ_RANDOM_R
-fi
+])
 gl_STDLIB_MODULE_INDICATOR([random_r])
 
 Makefile.am:
+if GL_COND_OBJ_RANDOM_R
+lib_SOURCES += random_r.c
+endif
 
 Include:
 <stdlib.h>
diff --git a/modules/rawmemchr b/modules/rawmemchr
index d30065e744..f3e46881d5 100644
--- a/modules/rawmemchr
+++ b/modules/rawmemchr
@@ -15,13 +15,16 @@ verify
 
 configure.ac:
 gl_FUNC_RAWMEMCHR
-if test $HAVE_RAWMEMCHR = 0; then
-  AC_LIBOBJ([rawmemchr])
+gl_CONDITIONAL([GL_COND_OBJ_RAWMEMCHR], [test $HAVE_RAWMEMCHR = 0])
+AM_COND_IF([GL_COND_OBJ_RAWMEMCHR], [
   gl_PREREQ_RAWMEMCHR
-fi
+])
 gl_STRING_MODULE_INDICATOR([rawmemchr])
 
 Makefile.am:
+if GL_COND_OBJ_RAWMEMCHR
+lib_SOURCES += rawmemchr.c
+endif
 
 Include:
 <string.h>
diff --git a/modules/read b/modules/read
index b83230aa98..494506559c 100644
--- a/modules/read
+++ b/modules/read
@@ -12,13 +12,16 @@ msvc-nothrow    [test $REPLACE_READ = 1]
 
 configure.ac:
 gl_FUNC_READ
-if test $REPLACE_READ = 1; then
-  AC_LIBOBJ([read])
+gl_CONDITIONAL([GL_COND_OBJ_READ], [test $REPLACE_READ = 1])
+AM_COND_IF([GL_COND_OBJ_READ], [
   gl_PREREQ_READ
-fi
+])
 gl_UNISTD_MODULE_INDICATOR([read])
 
 Makefile.am:
+if GL_COND_OBJ_READ
+lib_SOURCES += read.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/readdir b/modules/readdir
index 122ae5b3d0..cfa61c9c64 100644
--- a/modules/readdir
+++ b/modules/readdir
@@ -12,12 +12,13 @@ largefile
 
 configure.ac:
 gl_FUNC_READDIR
-if test $HAVE_READDIR = 0; then
-  AC_LIBOBJ([readdir])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_READDIR], [test $HAVE_READDIR = 0])
 gl_DIRENT_MODULE_INDICATOR([readdir])
 
 Makefile.am:
+if GL_COND_OBJ_READDIR
+lib_SOURCES += readdir.c
+endif
 
 Include:
 <dirent.h>
diff --git a/modules/readline b/modules/readline
index 9cee3bb271..137ee2a976 100644
--- a/modules/readline
+++ b/modules/readline
@@ -12,12 +12,15 @@ getline         [test "$gl_cv_lib_readline" = no]
 
 configure.ac:
 gl_FUNC_READLINE
-if test "$gl_cv_lib_readline" = no; then
-  AC_LIBOBJ([readline])
+gl_CONDITIONAL([GL_COND_OBJ_READLINE], [test "$gl_cv_lib_readline" = no])
+AM_COND_IF([GL_COND_OBJ_READLINE], [
   gl_PREREQ_READLINE
-fi
+])
 
 Makefile.am:
+if GL_COND_OBJ_READLINE
+lib_SOURCES += readline.c
+endif
 
 Include:
 "readline.h"
diff --git a/modules/readlink b/modules/readlink
index c93e8524c2..35d65bdd5d 100644
--- a/modules/readlink
+++ b/modules/readlink
@@ -11,13 +11,17 @@ stat            [test $HAVE_READLINK = 0 || test $REPLACE_READLINK = 1]
 
 configure.ac:
 gl_FUNC_READLINK
-if test $HAVE_READLINK = 0 || test $REPLACE_READLINK = 1; then
-  AC_LIBOBJ([readlink])
+gl_CONDITIONAL([GL_COND_OBJ_READLINK],
+               [test $HAVE_READLINK = 0 || test $REPLACE_READLINK = 1])
+AM_COND_IF([GL_COND_OBJ_READLINK], [
   gl_PREREQ_READLINK
-fi
+])
 gl_UNISTD_MODULE_INDICATOR([readlink])
 
 Makefile.am:
+if GL_COND_OBJ_READLINK
+lib_SOURCES += readlink.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/readlinkat b/modules/readlinkat
index 171ee31e01..a340bba089 100644
--- a/modules/readlinkat
+++ b/modules/readlinkat
@@ -22,12 +22,14 @@ readlink        [test $HAVE_READLINKAT = 0 || test $REPLACE_READLINKAT = 1]
 
 configure.ac:
 gl_FUNC_READLINKAT
-if test $HAVE_READLINKAT = 0 || test $REPLACE_READLINKAT = 1; then
-  AC_LIBOBJ([readlinkat])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_READLINKAT],
+               [test $HAVE_READLINKAT = 0 || test $REPLACE_READLINKAT = 1])
 gl_UNISTD_MODULE_INDICATOR([readlinkat])
 
 Makefile.am:
+if GL_COND_OBJ_READLINKAT
+lib_SOURCES += readlinkat.c
+endif
 
 Include:
 <fcntl.h>
diff --git a/modules/readutmp b/modules/readutmp
index 18cdad10f8..2a4a4ffc68 100644
--- a/modules/readutmp
+++ b/modules/readutmp
@@ -16,11 +16,13 @@ unlocked-io-internal
 
 configure.ac:
 gl_READUTMP
-if test $ac_cv_header_utmp_h = yes || test $ac_cv_header_utmpx_h = yes; then
-  AC_LIBOBJ([readutmp])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_READUTMP],
+               [test $ac_cv_header_utmp_h = yes || test $ac_cv_header_utmpx_h = yes])
 
 Makefile.am:
+if GL_COND_OBJ_READUTMP
+lib_SOURCES += readutmp.c
+endif
 
 Include:
 "readutmp.h"
diff --git a/modules/reallocarray b/modules/reallocarray
index dcf851d5f0..9d2db6b888 100644
--- a/modules/reallocarray
+++ b/modules/reallocarray
@@ -14,14 +14,18 @@ stdlib
 
 configure.ac:
 gl_FUNC_REALLOCARRAY
-if test $HAVE_REALLOCARRAY = 0 || test $REPLACE_REALLOCARRAY = 1; then
-  AC_LIBOBJ([reallocarray])
+gl_CONDITIONAL([GL_COND_OBJ_REALLOCARRAY],
+               [test $HAVE_REALLOCARRAY = 0 || test $REPLACE_REALLOCARRAY = 1])
+AM_COND_IF([GL_COND_OBJ_REALLOCARRAY], [
   gl_PREREQ_REALLOCARRAY
-fi
+])
 gl_MODULE_INDICATOR([reallocarray])
 gl_STDLIB_MODULE_INDICATOR([reallocarray])
 
 Makefile.am:
+if GL_COND_OBJ_REALLOCARRAY
+lib_SOURCES += reallocarray.c
+endif
 
 Include:
 <stdlib.h>
diff --git a/modules/recv b/modules/recv
index 6972de7b97..8c27a42208 100644
--- a/modules/recv
+++ b/modules/recv
@@ -13,12 +13,13 @@ msvc-nothrow    [test "$ac_cv_header_winsock2_h" = yes]
 
 configure.ac:
 AC_REQUIRE([gl_SYS_SOCKET_H])
-if test "$ac_cv_header_winsock2_h" = yes; then
-  AC_LIBOBJ([recv])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_RECV], [test "$ac_cv_header_winsock2_h" = yes])
 gl_SYS_SOCKET_MODULE_INDICATOR([recv])
 
 Makefile.am:
+if GL_COND_OBJ_RECV
+lib_SOURCES += recv.c
+endif
 
 Include:
 <sys/socket.h>
diff --git a/modules/recvfrom b/modules/recvfrom
index afc3961b39..cbf7e3a663 100644
--- a/modules/recvfrom
+++ b/modules/recvfrom
@@ -15,12 +15,13 @@ msvc-nothrow    [test "$ac_cv_header_winsock2_h" = yes]
 
 configure.ac:
 AC_REQUIRE([gl_SYS_SOCKET_H])
-if test "$ac_cv_header_winsock2_h" = yes; then
-  AC_LIBOBJ([recvfrom])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_RECVFROM], [test "$ac_cv_header_winsock2_h" = yes])
 gl_SYS_SOCKET_MODULE_INDICATOR([recvfrom])
 
 Makefile.am:
+if GL_COND_OBJ_RECVFROM
+lib_SOURCES += recvfrom.c
+endif
 
 Include:
 <sys/socket.h>
diff --git a/modules/regex b/modules/regex
index 352c0aaa24..e8ad558642 100644
--- a/modules/regex
+++ b/modules/regex
@@ -41,12 +41,15 @@ wctype          [test $ac_use_included_regex = yes]
 
 configure.ac:
 gl_REGEX
-if test $ac_use_included_regex = yes; then
-  AC_LIBOBJ([regex])
+gl_CONDITIONAL([GL_COND_OBJ_REGEX], [test $ac_use_included_regex = yes])
+AM_COND_IF([GL_COND_OBJ_REGEX], [
   gl_PREREQ_REGEX
-fi
+])
 
 Makefile.am:
+if GL_COND_OBJ_REGEX
+lib_SOURCES += regex.c
+endif
 
 Include:
 <regex.h>
diff --git a/modules/relocatable-prog b/modules/relocatable-prog
index 7e21682ecd..8e22b20dd0 100644
--- a/modules/relocatable-prog
+++ b/modules/relocatable-prog
@@ -28,12 +28,15 @@ strdup
 
 configure.ac:
 gl_RELOCATABLE([$gl_source_base])
-if test $RELOCATABLE = yes; then
-  AC_LIBOBJ([progreloc])
+gl_CONDITIONAL([GL_COND_OBJ_PROGRELOC], [test $RELOCATABLE = yes])
+AM_COND_IF([GL_COND_OBJ_PROGRELOC], [
   AC_LIBOBJ([relocatable])
-fi
+])
 
 Makefile.am:
+if GL_COND_OBJ_PROGRELOC
+lib_SOURCES += progreloc.c
+endif
 DEFS += -DEXEEXT=\"@EXEEXT@\"
 if RELOCATABLE_VIA_WRAPPER
 uninstall-hook: uninstall-relocwrapper
diff --git a/modules/remainder b/modules/remainder
index 6c5432bdbf..08d7aacaab 100644
--- a/modules/remainder
+++ b/modules/remainder
@@ -17,12 +17,14 @@ isinf           [test $HAVE_REMAINDER = 0 || test $REPLACE_REMAINDER = 1]
 
 configure.ac:
 gl_FUNC_REMAINDER
-if test $HAVE_REMAINDER = 0 || test $REPLACE_REMAINDER = 1; then
-  AC_LIBOBJ([remainder])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_REMAINDER],
+               [test $HAVE_REMAINDER = 0 || test $REPLACE_REMAINDER = 1])
 gl_MATH_MODULE_INDICATOR([remainder])
 
 Makefile.am:
+if GL_COND_OBJ_REMAINDER
+lib_SOURCES += remainder.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/remainderf b/modules/remainderf
index b30242b2cf..457619aa6e 100644
--- a/modules/remainderf
+++ b/modules/remainderf
@@ -20,12 +20,14 @@ isinf           [test $HAVE_REMAINDERF = 0 || test $REPLACE_REMAINDERF = 1]
 
 configure.ac:
 gl_FUNC_REMAINDERF
-if test $HAVE_REMAINDERF = 0 || test $REPLACE_REMAINDERF = 1; then
-  AC_LIBOBJ([remainderf])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_REMAINDERF],
+               [test $HAVE_REMAINDERF = 0 || test $REPLACE_REMAINDERF = 1])
 gl_MATH_MODULE_INDICATOR([remainderf])
 
 Makefile.am:
+if GL_COND_OBJ_REMAINDERF
+lib_SOURCES += remainderf.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/remainderl b/modules/remainderl
index dbbe9047c2..08be4ea68d 100644
--- a/modules/remainderl
+++ b/modules/remainderl
@@ -21,12 +21,14 @@ isinf           [{ test $HAVE_REMAINDERL = 0 || test $REPLACE_REMAINDERL = 1; }
 
 configure.ac:
 gl_FUNC_REMAINDERL
-if test $HAVE_REMAINDERL = 0 || test $REPLACE_REMAINDERL = 1; then
-  AC_LIBOBJ([remainderl])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_REMAINDERL],
+               [test $HAVE_REMAINDERL = 0 || test $REPLACE_REMAINDERL = 1])
 gl_MATH_MODULE_INDICATOR([remainderl])
 
 Makefile.am:
+if GL_COND_OBJ_REMAINDERL
+lib_SOURCES += remainderl.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/remove b/modules/remove
index 0caf48a7ff..7961af8b04 100644
--- a/modules/remove
+++ b/modules/remove
@@ -12,12 +12,13 @@ unlink          [test $REPLACE_REMOVE = 1]
 
 configure.ac:
 gl_FUNC_REMOVE
-if test $REPLACE_REMOVE = 1; then
-  AC_LIBOBJ([remove])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_REMOVE], [test $REPLACE_REMOVE = 1])
 gl_STDIO_MODULE_INDICATOR([remove])
 
 Makefile.am:
+if GL_COND_OBJ_REMOVE
+lib_SOURCES += remove.c
+endif
 
 Include:
 <stdio.h>
diff --git a/modules/rename b/modules/rename
index 07299c235a..d06d4c6f25 100644
--- a/modules/rename
+++ b/modules/rename
@@ -20,12 +20,13 @@ strdup            [test $REPLACE_RENAME = 1]
 
 configure.ac:
 gl_FUNC_RENAME
-if test $REPLACE_RENAME = 1; then
-  AC_LIBOBJ([rename])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_RENAME], [test $REPLACE_RENAME = 1])
 gl_STDIO_MODULE_INDICATOR([rename])
 
 Makefile.am:
+if GL_COND_OBJ_RENAME
+lib_SOURCES += rename.c
+endif
 
 Include:
 <stdio.h>
diff --git a/modules/renameat b/modules/renameat
index 6103558a31..10073c5ebd 100644
--- a/modules/renameat
+++ b/modules/renameat
@@ -11,15 +11,17 @@ renameatu        [test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1]
 
 configure.ac:
 gl_FUNC_RENAMEAT
-if test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1; then
-  AC_LIBOBJ([renameat])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_RENAMEAT],
+               [test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1])
 if test $HAVE_RENAMEAT = 0; then
   AC_LIBOBJ([at-func2])
 fi
 gl_STDIO_MODULE_INDICATOR([renameat])
 
 Makefile.am:
+if GL_COND_OBJ_RENAMEAT
+lib_SOURCES += renameat.c
+endif
 
 Include:
 <stdio.h>
diff --git a/modules/rewinddir b/modules/rewinddir
index b95980df58..38cf6db0bc 100644
--- a/modules/rewinddir
+++ b/modules/rewinddir
@@ -13,12 +13,13 @@ largefile
 
 configure.ac:
 gl_FUNC_REWINDDIR
-if test $HAVE_REWINDDIR = 0; then
-  AC_LIBOBJ([rewinddir])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_REWINDDIR], [test $HAVE_REWINDDIR = 0])
 gl_DIRENT_MODULE_INDICATOR([rewinddir])
 
 Makefile.am:
+if GL_COND_OBJ_REWINDDIR
+lib_SOURCES += rewinddir.c
+endif
 
 Include:
 <dirent.h>
diff --git a/modules/rint b/modules/rint
index a40b1457e1..887b3da870 100644
--- a/modules/rint
+++ b/modules/rint
@@ -11,12 +11,13 @@ math
 
 configure.ac:
 gl_FUNC_RINT
-if test $HAVE_RINT = 0; then
-  AC_LIBOBJ([rint])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_RINT], [test $HAVE_RINT = 0])
 gl_MATH_MODULE_INDICATOR([rint])
 
 Makefile.am:
+if GL_COND_OBJ_RINT
+lib_SOURCES += rint.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/rintf b/modules/rintf
index 2b89142d2c..85e8f7ad43 100644
--- a/modules/rintf
+++ b/modules/rintf
@@ -13,12 +13,13 @@ extensions
 
 configure.ac:
 gl_FUNC_RINTF
-if test $HAVE_RINTF = 0; then
-  AC_LIBOBJ([rintf])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_RINTF], [test $HAVE_RINTF = 0])
 gl_MATH_MODULE_INDICATOR([rintf])
 
 Makefile.am:
+if GL_COND_OBJ_RINTF
+lib_SOURCES += rintf.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/rintl b/modules/rintl
index cedabfdb79..3a03703afe 100644
--- a/modules/rintl
+++ b/modules/rintl
@@ -14,12 +14,14 @@ rint            [{ test $HAVE_RINTL = 0 || test $REPLACE_RINTL = 1; } && test $H
 
 configure.ac:
 gl_FUNC_RINTL
-if test $HAVE_RINTL = 0 || test $REPLACE_RINTL = 1; then
-  AC_LIBOBJ([rintl])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_RINTL],
+               [test $HAVE_RINTL = 0 || test $REPLACE_RINTL = 1])
 gl_MATH_MODULE_INDICATOR([rintl])
 
 Makefile.am:
+if GL_COND_OBJ_RINTL
+lib_SOURCES += rintl.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/rmdir b/modules/rmdir
index 85336ba803..426587560e 100644
--- a/modules/rmdir
+++ b/modules/rmdir
@@ -12,12 +12,13 @@ sys_stat        [test $REPLACE_RMDIR = 1]
 
 configure.ac:
 gl_FUNC_RMDIR
-if test $REPLACE_RMDIR = 1; then
-  AC_LIBOBJ([rmdir])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_RMDIR], [test $REPLACE_RMDIR = 1])
 gl_UNISTD_MODULE_INDICATOR([rmdir])
 
 Makefile.am:
+if GL_COND_OBJ_RMDIR
+lib_SOURCES += rmdir.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/round b/modules/round
index c057822221..8dde54b9f7 100644
--- a/modules/round
+++ b/modules/round
@@ -16,12 +16,14 @@ floor           [test $HAVE_ROUND = 0 || test $REPLACE_ROUND = 1]
 
 configure.ac:
 gl_FUNC_ROUND
-if test $HAVE_ROUND = 0 || test $REPLACE_ROUND = 1; then
-  AC_LIBOBJ([round])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_ROUND],
+               [test $HAVE_ROUND = 0 || test $REPLACE_ROUND = 1])
 gl_MATH_MODULE_INDICATOR([round])
 
 Makefile.am:
+if GL_COND_OBJ_ROUND
+lib_SOURCES += round.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/roundf b/modules/roundf
index 619233db1c..4cb5bcdc79 100644
--- a/modules/roundf
+++ b/modules/roundf
@@ -16,12 +16,14 @@ float           [test $HAVE_ROUNDF = 0 || test $REPLACE_ROUNDF = 1]
 
 configure.ac:
 gl_FUNC_ROUNDF
-if test $HAVE_ROUNDF = 0 || test $REPLACE_ROUNDF = 1; then
-  AC_LIBOBJ([roundf])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_ROUNDF],
+               [test $HAVE_ROUNDF = 0 || test $REPLACE_ROUNDF = 1])
 gl_MATH_MODULE_INDICATOR([roundf])
 
 Makefile.am:
+if GL_COND_OBJ_ROUNDF
+lib_SOURCES += roundf.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/roundl b/modules/roundl
index 22486ab779..87cd4ff34d 100644
--- a/modules/roundl
+++ b/modules/roundl
@@ -17,12 +17,14 @@ float           [{ test $HAVE_ROUNDL = 0 || test $REPLACE_ROUNDL = 1; } && test
 
 configure.ac:
 gl_FUNC_ROUNDL
-if test $HAVE_ROUNDL = 0 || test $REPLACE_ROUNDL = 1; then
-  AC_LIBOBJ([roundl])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_ROUNDL],
+               [test $HAVE_ROUNDL = 0 || test $REPLACE_ROUNDL = 1])
 gl_MATH_MODULE_INDICATOR([roundl])
 
 Makefile.am:
+if GL_COND_OBJ_ROUNDL
+lib_SOURCES += roundl.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/rpmatch b/modules/rpmatch
index 2e0e7e3067..7f8d9910ab 100644
--- a/modules/rpmatch
+++ b/modules/rpmatch
@@ -15,13 +15,16 @@ strdup          [test $HAVE_RPMATCH = 0]
 
 configure.ac:
 gl_FUNC_RPMATCH
-if test $HAVE_RPMATCH = 0; then
-  AC_LIBOBJ([rpmatch])
+gl_CONDITIONAL([GL_COND_OBJ_RPMATCH], [test $HAVE_RPMATCH = 0])
+AM_COND_IF([GL_COND_OBJ_RPMATCH], [
   gl_PREREQ_RPMATCH
-fi
+])
 gl_STDLIB_MODULE_INDICATOR([rpmatch])
 
 Makefile.am:
+if GL_COND_OBJ_RPMATCH
+lib_SOURCES += rpmatch.c
+endif
 
 Include:
 <stdlib.h>
diff --git a/modules/scandir b/modules/scandir
index 8d5e1058d8..eefdfa7cff 100644
--- a/modules/scandir
+++ b/modules/scandir
@@ -16,13 +16,16 @@ readdir
 
 configure.ac:
 gl_FUNC_SCANDIR
-if test $HAVE_SCANDIR = 0; then
-  AC_LIBOBJ([scandir])
+gl_CONDITIONAL([GL_COND_OBJ_SCANDIR], [test $HAVE_SCANDIR = 0])
+AM_COND_IF([GL_COND_OBJ_SCANDIR], [
   gl_PREREQ_SCANDIR
-fi
+])
 gl_DIRENT_MODULE_INDICATOR([scandir])
 
 Makefile.am:
+if GL_COND_OBJ_SCANDIR
+lib_SOURCES += scandir.c
+endif
 
 Include:
 <dirent.h>
diff --git a/modules/sched_yield b/modules/sched_yield
index 69aa94c53a..6d683d58d4 100644
--- a/modules/sched_yield
+++ b/modules/sched_yield
@@ -11,12 +11,14 @@ sched
 
 configure.ac:
 gl_FUNC_SCHED_YIELD
-if test $HAVE_SCHED_YIELD = 0 || test $REPLACE_SCHED_YIELD = 1; then
-  AC_LIBOBJ([sched_yield])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_SCHED_YIELD],
+               [test $HAVE_SCHED_YIELD = 0 || test $REPLACE_SCHED_YIELD = 1])
 gl_SCHED_MODULE_INDICATOR([sched_yield])
 
 Makefile.am:
+if GL_COND_OBJ_SCHED_YIELD
+lib_SOURCES += sched_yield.c
+endif
 
 Include:
 <sched.h>
diff --git a/modules/secure_getenv b/modules/secure_getenv
index 495549d498..d322c5e370 100644
--- a/modules/secure_getenv
+++ b/modules/secure_getenv
@@ -11,13 +11,16 @@ extensions
 
 configure.ac:
 gl_FUNC_SECURE_GETENV
-if test $HAVE_SECURE_GETENV = 0; then
-  AC_LIBOBJ([secure_getenv])
+gl_CONDITIONAL([GL_COND_OBJ_SECURE_GETENV], [test $HAVE_SECURE_GETENV = 0])
+AM_COND_IF([GL_COND_OBJ_SECURE_GETENV], [
   gl_PREREQ_SECURE_GETENV
-fi
+])
 gl_STDLIB_MODULE_INDICATOR([secure_getenv])
 
 Makefile.am:
+if GL_COND_OBJ_SECURE_GETENV
+lib_SOURCES += secure_getenv.c
+endif
 
 Include:
 <stdlib.h>
diff --git a/modules/select b/modules/select
index 28c89ee9c1..fd3529315c 100644
--- a/modules/select
+++ b/modules/select
@@ -15,12 +15,13 @@ msvc-nothrow    [test $REPLACE_SELECT = 1]
 
 configure.ac:
 gl_FUNC_SELECT
-if test $REPLACE_SELECT = 1; then
-  AC_LIBOBJ([select])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_SELECT], [test $REPLACE_SELECT = 1])
 gl_SYS_SELECT_MODULE_INDICATOR([select])
 
 Makefile.am:
+if GL_COND_OBJ_SELECT
+lib_SOURCES += select.c
+endif
 
 Include:
 <sys/select.h>
diff --git a/modules/selinux-h b/modules/selinux-h
index 6eaaaa83d6..041b0663d5 100644
--- a/modules/selinux-h
+++ b/modules/selinux-h
@@ -25,14 +25,10 @@ gl_HEADERS_SELINUX_LABEL_H
 gl_CONDITIONAL_HEADER([selinux/context.h])
 gl_CONDITIONAL_HEADER([selinux/label.h])
 AC_PROG_MKDIR_P
-if test "$with_selinux" != no && test "$ac_cv_header_selinux_selinux_h" = yes; then
-  AC_LIBOBJ([getfilecon])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_GETFILECON],
+               [test "$with_selinux" != no && test "$ac_cv_header_selinux_selinux_h" = yes])
 
 Makefile.am:
-lib_SOURCES += se-context.in.h se-label.in.h se-selinux.in.h \
-  se-context.c se-label.c se-selinux.c
-
 BUILT_SOURCES += selinux/selinux.h
 selinux/selinux.h: se-selinux.in.h $(top_builddir)/config.status
 	$(AM_V_GEN)$(MKDIR_P) '%reldir%/selinux'
@@ -72,6 +68,12 @@ MOSTLYCLEANFILES += selinux/label.h selinux/label.h-t
 
 MOSTLYCLEANDIRS += selinux
 
+if GL_COND_OBJ_GETFILECON
+lib_SOURCES += getfilecon.c
+endif
+lib_SOURCES += se-context.in.h se-label.in.h se-selinux.in.h \
+  se-context.c se-label.c se-selinux.c
+
 Include:
 <selinux/selinux.h>
 <selinux/context.h>
diff --git a/modules/send b/modules/send
index e6e63f7c1d..6584aec9ae 100644
--- a/modules/send
+++ b/modules/send
@@ -13,12 +13,13 @@ msvc-nothrow    [test "$ac_cv_header_winsock2_h" = yes]
 
 configure.ac:
 AC_REQUIRE([gl_SYS_SOCKET_H])
-if test "$ac_cv_header_winsock2_h" = yes; then
-  AC_LIBOBJ([send])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_SEND], [test "$ac_cv_header_winsock2_h" = yes])
 gl_SYS_SOCKET_MODULE_INDICATOR([send])
 
 Makefile.am:
+if GL_COND_OBJ_SEND
+lib_SOURCES += send.c
+endif
 
 Include:
 <sys/socket.h>
diff --git a/modules/sendto b/modules/sendto
index b78ed8c760..a5d4d5702c 100644
--- a/modules/sendto
+++ b/modules/sendto
@@ -13,12 +13,13 @@ msvc-nothrow    [test "$ac_cv_header_winsock2_h" = yes]
 
 configure.ac:
 AC_REQUIRE([gl_SYS_SOCKET_H])
-if test "$ac_cv_header_winsock2_h" = yes; then
-  AC_LIBOBJ([sendto])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_SENDTO], [test "$ac_cv_header_winsock2_h" = yes])
 gl_SYS_SOCKET_MODULE_INDICATOR([sendto])
 
 Makefile.am:
+if GL_COND_OBJ_SENDTO
+lib_SOURCES += sendto.c
+endif
 
 Include:
 <sys/socket.h>
diff --git a/modules/setenv b/modules/setenv
index 829156e6df..a907d1e5d0 100644
--- a/modules/setenv
+++ b/modules/setenv
@@ -14,12 +14,14 @@ environ         [test $HAVE_SETENV = 0 || test $REPLACE_SETENV = 1]
 
 configure.ac:
 gl_FUNC_SETENV
-if test $HAVE_SETENV = 0 || test $REPLACE_SETENV = 1; then
-  AC_LIBOBJ([setenv])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_SETENV],
+               [test $HAVE_SETENV = 0 || test $REPLACE_SETENV = 1])
 gl_STDLIB_MODULE_INDICATOR([setenv])
 
 Makefile.am:
+if GL_COND_OBJ_SETENV
+lib_SOURCES += setenv.c
+endif
 
 Include:
 <stdlib.h>
diff --git a/modules/sethostname b/modules/sethostname
index 92b4a2b98f..56b68b2ad4 100644
--- a/modules/sethostname
+++ b/modules/sethostname
@@ -13,12 +13,13 @@ fopen-gnu       [test $HAVE_SETHOSTNAME = 0]
 
 configure.ac:
 gl_FUNC_SETHOSTNAME
-if test $HAVE_SETHOSTNAME = 0; then
-  AC_LIBOBJ([sethostname])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_SETHOSTNAME], [test $HAVE_SETHOSTNAME = 0])
 gl_UNISTD_MODULE_INDICATOR([sethostname])
 
 Makefile.am:
+if GL_COND_OBJ_SETHOSTNAME
+lib_SOURCES += sethostname.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/setlocale b/modules/setlocale
index cc92e1a8bc..552c978baa 100644
--- a/modules/setlocale
+++ b/modules/setlocale
@@ -12,13 +12,16 @@ setlocale-null  [test $NEED_SETLOCALE_MTSAFE = 1]
 
 configure.ac:
 gl_FUNC_SETLOCALE
-if test $REPLACE_SETLOCALE = 1; then
-  AC_LIBOBJ([setlocale])
+gl_CONDITIONAL([GL_COND_OBJ_SETLOCALE], [test $REPLACE_SETLOCALE = 1])
+AM_COND_IF([GL_COND_OBJ_SETLOCALE], [
   gl_PREREQ_SETLOCALE
-fi
+])
 gl_LOCALE_MODULE_INDICATOR([setlocale])
 
 Makefile.am:
+if GL_COND_OBJ_SETLOCALE
+lib_SOURCES += setlocale.c
+endif
 
 Include:
 <locale.h>
diff --git a/modules/setlocale-null b/modules/setlocale-null
index 2774004ff1..11ad6f1faa 100644
--- a/modules/setlocale-null
+++ b/modules/setlocale-null
@@ -16,14 +16,18 @@ snippet/arg-nonnull
 
 configure.ac:
 gl_FUNC_SETLOCALE_NULL
-if test $SETLOCALE_NULL_ALL_MTSAFE = 0 || test $SETLOCALE_NULL_ONE_MTSAFE = 0; then
-  AC_LIBOBJ([setlocale-lock])
+gl_CONDITIONAL([GL_COND_OBJ_SETLOCALE_LOCK],
+               [test $SETLOCALE_NULL_ALL_MTSAFE = 0 || test $SETLOCALE_NULL_ONE_MTSAFE = 0])
+AM_COND_IF([GL_COND_OBJ_SETLOCALE_LOCK], [
   gl_PREREQ_SETLOCALE_LOCK
-fi
+])
 gl_LOCALE_MODULE_INDICATOR([setlocale_null])
 
 Makefile.am:
 lib_SOURCES += setlocale_null.c
+if GL_COND_OBJ_SETLOCALE_LOCK
+lib_SOURCES += setlocale-lock.c
+endif
 
 Include:
 #include "setlocale_null.h" or #include <locale.h>
diff --git a/modules/setsockopt b/modules/setsockopt
index 63c02d336a..1b1bdad069 100644
--- a/modules/setsockopt
+++ b/modules/setsockopt
@@ -14,12 +14,14 @@ msvc-nothrow    [test "$ac_cv_header_winsock2_h" = yes]
 
 configure.ac:
 AC_REQUIRE([gl_SYS_SOCKET_H])
-if test "$ac_cv_header_winsock2_h" = yes; then
-  AC_LIBOBJ([setsockopt])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_SETSOCKOPT],
+               [test "$ac_cv_header_winsock2_h" = yes])
 gl_SYS_SOCKET_MODULE_INDICATOR([setsockopt])
 
 Makefile.am:
+if GL_COND_OBJ_SETSOCKOPT
+lib_SOURCES += setsockopt.c
+endif
 
 Include:
 <sys/socket.h>
diff --git a/modules/shutdown b/modules/shutdown
index e34892358e..6af957a9c2 100644
--- a/modules/shutdown
+++ b/modules/shutdown
@@ -13,12 +13,13 @@ msvc-nothrow    [test "$ac_cv_header_winsock2_h" = yes]
 
 configure.ac:
 AC_REQUIRE([gl_SYS_SOCKET_H])
-if test "$ac_cv_header_winsock2_h" = yes; then
-  AC_LIBOBJ([shutdown])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_SHUTDOWN], [test "$ac_cv_header_winsock2_h" = yes])
 gl_SYS_SOCKET_MODULE_INDICATOR([shutdown])
 
 Makefile.am:
+if GL_COND_OBJ_SHUTDOWN
+lib_SOURCES += shutdown.c
+endif
 
 Include:
 <sys/socket.h>
diff --git a/modules/sig2str b/modules/sig2str
index ccc26a90f6..cb26add2d0 100644
--- a/modules/sig2str
+++ b/modules/sig2str
@@ -11,12 +11,15 @@ intprops
 
 configure.ac:
 gl_FUNC_SIG2STR
-if test $ac_cv_func_sig2str = no; then
-  AC_LIBOBJ([sig2str])
+gl_CONDITIONAL([GL_COND_OBJ_SIG2STR], [test $ac_cv_func_sig2str = no])
+AM_COND_IF([GL_COND_OBJ_SIG2STR], [
   gl_PREREQ_SIG2STR
-fi
+])
 
 Makefile.am:
+if GL_COND_OBJ_SIG2STR
+lib_SOURCES += sig2str.c
+endif
 
 Include:
 "sig2str.h"
diff --git a/modules/sigabbrev_np b/modules/sigabbrev_np
index 9f2edfdbd2..7531138fc0 100644
--- a/modules/sigabbrev_np
+++ b/modules/sigabbrev_np
@@ -11,12 +11,13 @@ string
 
 configure.ac:
 gl_FUNC_SIGABBREV_NP
-if test $HAVE_SIGABBREV_NP = 0; then
-  AC_LIBOBJ([sigabbrev_np])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_SIGABBREV_NP], [test $HAVE_SIGABBREV_NP = 0])
 gl_STRING_MODULE_INDICATOR([sigabbrev_np])
 
 Makefile.am:
+if GL_COND_OBJ_SIGABBREV_NP
+lib_SOURCES += sigabbrev_np.c
+endif
 
 Include:
 <string.h>
diff --git a/modules/sigaction b/modules/sigaction
index 438748230d..af8761cdd9 100644
--- a/modules/sigaction
+++ b/modules/sigaction
@@ -14,13 +14,16 @@ sigprocmask     [test $HAVE_SIGACTION = 0]
 
 configure.ac:
 gl_SIGACTION
-if test $HAVE_SIGACTION = 0; then
-  AC_LIBOBJ([sigaction])
+gl_CONDITIONAL([GL_COND_OBJ_SIGACTION], [test $HAVE_SIGACTION = 0])
+AM_COND_IF([GL_COND_OBJ_SIGACTION], [
   gl_PREREQ_SIGACTION
-fi
+])
 gl_SIGNAL_MODULE_INDICATOR([sigaction])
 
 Makefile.am:
+if GL_COND_OBJ_SIGACTION
+lib_SOURCES += sigaction.c
+endif
 lib_SOURCES += sig-handler.c
 
 Include:
diff --git a/modules/sigdescr_np b/modules/sigdescr_np
index 6a6c6cebf8..e085f9487b 100644
--- a/modules/sigdescr_np
+++ b/modules/sigdescr_np
@@ -11,12 +11,13 @@ string
 
 configure.ac:
 gl_FUNC_SIGDESCR_NP
-if test $HAVE_SIGDESCR_NP = 0; then
-  AC_LIBOBJ([sigdescr_np])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_SIGDESCR_NP], [test $HAVE_SIGDESCR_NP = 0])
 gl_STRING_MODULE_INDICATOR([sigdescr_np])
 
 Makefile.am:
+if GL_COND_OBJ_SIGDESCR_NP
+lib_SOURCES += sigdescr_np.c
+endif
 
 Include:
 <string.h>
diff --git a/modules/signbit b/modules/signbit
index 2652cfda83..59008b6047 100644
--- a/modules/signbit
+++ b/modules/signbit
@@ -19,14 +19,13 @@ memcmp          [test $REPLACE_SIGNBIT = 1]
 
 configure.ac:
 gl_SIGNBIT
-if test $REPLACE_SIGNBIT = 1; then
-  AC_LIBOBJ([signbitf])
-  AC_LIBOBJ([signbitd])
-  AC_LIBOBJ([signbitl])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_SIGNBIT3], [test $REPLACE_SIGNBIT = 1])
 gl_MATH_MODULE_INDICATOR([signbit])
 
 Makefile.am:
+if GL_COND_OBJ_SIGNBIT3
+lib_SOURCES += signbitf.c signbitd.c signbitl.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/sigprocmask b/modules/sigprocmask
index 8c6947bb7b..174af0df26 100644
--- a/modules/sigprocmask
+++ b/modules/sigprocmask
@@ -13,13 +13,16 @@ msvc-inval      [test $HAVE_POSIX_SIGNALBLOCKING = 0]
 
 configure.ac:
 gl_SIGNALBLOCKING
-if test $HAVE_POSIX_SIGNALBLOCKING = 0; then
-  AC_LIBOBJ([sigprocmask])
+gl_CONDITIONAL([GL_COND_OBJ_SIGPROCMASK], [test $HAVE_POSIX_SIGNALBLOCKING = 0])
+AM_COND_IF([GL_COND_OBJ_SIGPROCMASK], [
   gl_PREREQ_SIGPROCMASK
-fi
+])
 gl_SIGNAL_MODULE_INDICATOR([sigprocmask])
 
 Makefile.am:
+if GL_COND_OBJ_SIGPROCMASK
+lib_SOURCES += sigprocmask.c
+endif
 
 Include:
 <signal.h>
diff --git a/modules/sinf b/modules/sinf
index 07574faf9d..d7f2fe4eb9 100644
--- a/modules/sinf
+++ b/modules/sinf
@@ -12,12 +12,13 @@ sin             [test $HAVE_SINF = 0]
 
 configure.ac:
 gl_FUNC_SINF
-if test $HAVE_SINF = 0; then
-  AC_LIBOBJ([sinf])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_SINF], [test $HAVE_SINF = 0])
 gl_MATH_MODULE_INDICATOR([sinf])
 
 Makefile.am:
+if GL_COND_OBJ_SINF
+lib_SOURCES += sinf.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/sinhf b/modules/sinhf
index aa833b2bae..bae16089c8 100644
--- a/modules/sinhf
+++ b/modules/sinhf
@@ -12,12 +12,13 @@ sinh            [test $HAVE_SINHF = 0]
 
 configure.ac:
 gl_FUNC_SINHF
-if test $HAVE_SINHF = 0; then
-  AC_LIBOBJ([sinhf])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_SINHF], [test $HAVE_SINHF = 0])
 gl_MATH_MODULE_INDICATOR([sinhf])
 
 Makefile.am:
+if GL_COND_OBJ_SINHF
+lib_SOURCES += sinhf.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/sinl b/modules/sinl
index 6ee7834e52..b2f2108095 100644
--- a/modules/sinl
+++ b/modules/sinl
@@ -19,16 +19,19 @@ floorl          [test $HAVE_SINL = 0 && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE =
 
 configure.ac:
 gl_FUNC_SINL
-if test $HAVE_SINL = 0; then
-  AC_LIBOBJ([sinl])
+gl_CONDITIONAL([GL_COND_OBJ_SINL], [test $HAVE_SINL = 0])
+AM_COND_IF([GL_COND_OBJ_SINL], [
   if test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0; then
     AC_LIBOBJ([sincosl])
     AC_LIBOBJ([trigl])
   fi
-fi
+])
 gl_MATH_MODULE_INDICATOR([sinl])
 
 Makefile.am:
+if GL_COND_OBJ_SINL
+lib_SOURCES += sinl.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/sleep b/modules/sleep
index 0c72048aa8..8ce74a43d9 100644
--- a/modules/sleep
+++ b/modules/sleep
@@ -12,12 +12,14 @@ verify          [test $HAVE_SLEEP = 0 || test $REPLACE_SLEEP = 1]
 
 configure.ac:
 gl_FUNC_SLEEP
-if test $HAVE_SLEEP = 0 || test $REPLACE_SLEEP = 1; then
-  AC_LIBOBJ([sleep])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_SLEEP],
+               [test $HAVE_SLEEP = 0 || test $REPLACE_SLEEP = 1])
 gl_UNISTD_MODULE_INDICATOR([sleep])
 
 Makefile.am:
+if GL_COND_OBJ_SLEEP
+lib_SOURCES += sleep.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/socket b/modules/socket
index b1c73bc860..3670c6b839 100644
--- a/modules/socket
+++ b/modules/socket
@@ -14,9 +14,7 @@ msvc-nothrow    [test "$ac_cv_header_winsock2_h" = yes]
 
 configure.ac:
 AC_REQUIRE([gl_SYS_SOCKET_H])
-if test "$ac_cv_header_winsock2_h" = yes; then
-  AC_LIBOBJ([socket])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_SOCKET], [test "$ac_cv_header_winsock2_h" = yes])
 # When this module is used, sockets may actually occur as file descriptors,
 # hence it is worth warning if the modules 'close' and 'ioctl' are not used.
 m4_ifdef([gl_UNISTD_H_DEFAULTS], [gl_UNISTD_H_REQUIRE_DEFAULTS])
@@ -29,6 +27,9 @@ fi
 gl_SYS_SOCKET_MODULE_INDICATOR([socket])
 
 Makefile.am:
+if GL_COND_OBJ_SOCKET
+lib_SOURCES += socket.c
+endif
 
 Include:
 <sys/socket.h>
diff --git a/modules/spawn-pipe b/modules/spawn-pipe
index fb5b658859..b2b343c093 100644
--- a/modules/spawn-pipe
+++ b/modules/spawn-pipe
@@ -47,14 +47,14 @@ xalloc-die
 configure.ac:
 gl_SPAWN_PIPE
 AC_REQUIRE([AC_CANONICAL_HOST])
-case "$host_os" in
-  os2*)
-    AC_LIBOBJ([os2-spawn])
-    ;;
-esac
+gl_CONDITIONAL([GL_COND_OBJ_OS2_SPAWN],
+               [case "$host_os" in os2*) true;; *) false;; esac])
 
 Makefile.am:
 lib_SOURCES += spawn-pipe.h spawn-pipe.c
+if GL_COND_OBJ_OS2_SPAWN
+lib_SOURCES += os2-spawn.c
+endif
 
 Include:
 "spawn-pipe.h"
diff --git a/modules/sqrtf b/modules/sqrtf
index d0bd6de716..9ed57546ab 100644
--- a/modules/sqrtf
+++ b/modules/sqrtf
@@ -12,12 +12,13 @@ sqrt            [test $HAVE_SQRTF = 0]
 
 configure.ac:
 gl_FUNC_SQRTF
-if test $HAVE_SQRTF = 0; then
-  AC_LIBOBJ([sqrtf])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_SQRTF], [test $HAVE_SQRTF = 0])
 gl_MATH_MODULE_INDICATOR([sqrtf])
 
 Makefile.am:
+if GL_COND_OBJ_SQRTF
+lib_SOURCES += sqrtf.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/sqrtl b/modules/sqrtl
index 65a91d7c98..a028271654 100644
--- a/modules/sqrtl
+++ b/modules/sqrtl
@@ -16,12 +16,14 @@ ldexpl          [{ test $HAVE_SQRTL = 0 || test $REPLACE_SQRTL = 1; } && test $H
 
 configure.ac:
 gl_FUNC_SQRTL
-if test $HAVE_SQRTL = 0 || test $REPLACE_SQRTL = 1; then
-  AC_LIBOBJ([sqrtl])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_SQRTL],
+               [test $HAVE_SQRTL = 0 || test $REPLACE_SQRTL = 1])
 gl_MATH_MODULE_INDICATOR([sqrtl])
 
 Makefile.am:
+if GL_COND_OBJ_SQRTL
+lib_SOURCES += sqrtl.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/stat b/modules/stat
index 519879cafb..96d7a03fd5 100644
--- a/modules/stat
+++ b/modules/stat
@@ -19,18 +19,21 @@ verify          [test $REPLACE_STAT = 1]
 
 configure.ac:
 gl_FUNC_STAT
-if test $REPLACE_STAT = 1; then
-  AC_LIBOBJ([stat])
+gl_CONDITIONAL([GL_COND_OBJ_STAT], [test $REPLACE_STAT = 1])
+AM_COND_IF([GL_COND_OBJ_STAT], [
   case "$host_os" in
     mingw*)
       AC_LIBOBJ([stat-w32])
       ;;
   esac
   gl_PREREQ_STAT
-fi
+])
 gl_SYS_STAT_MODULE_INDICATOR([stat])
 
 Makefile.am:
+if GL_COND_OBJ_STAT
+lib_SOURCES += stat.c
+endif
 
 Include:
 <sys/stat.h>
diff --git a/modules/stdio b/modules/stdio
index 61b89e0c86..105bc3506b 100644
--- a/modules/stdio
+++ b/modules/stdio
@@ -20,12 +20,8 @@ configure.ac:
 gl_STDIO_H
 gl_STDIO_H_REQUIRE_DEFAULTS
 AC_PROG_MKDIR_P
-if test $REPLACE_STDIO_READ_FUNCS = 1; then
-  AC_LIBOBJ([stdio-read])
-fi
-if test $REPLACE_STDIO_WRITE_FUNCS = 1; then
-  AC_LIBOBJ([stdio-write])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_STDIO_READ], [test $REPLACE_STDIO_READ_FUNCS = 1])
+gl_CONDITIONAL([GL_COND_OBJ_STDIO_WRITE], [test $REPLACE_STDIO_WRITE_FUNCS = 1])
 
 dnl No need to create extra modules for these functions. Everyone who uses
 dnl <stdio.h> likely needs them.
@@ -184,6 +180,13 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
 	$(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += stdio.h stdio.h-t
 
+if GL_COND_OBJ_STDIO_READ
+lib_SOURCES += stdio-read.c
+endif
+if GL_COND_OBJ_STDIO_WRITE
+lib_SOURCES += stdio-write.c
+endif
+
 Include:
 <stdio.h>
 
diff --git a/modules/stpcpy b/modules/stpcpy
index 3a7cd40196..a4aac236a2 100644
--- a/modules/stpcpy
+++ b/modules/stpcpy
@@ -11,13 +11,16 @@ string
 
 configure.ac:
 gl_FUNC_STPCPY
-if test $HAVE_STPCPY = 0; then
-  AC_LIBOBJ([stpcpy])
+gl_CONDITIONAL([GL_COND_OBJ_STPCPY], [test $HAVE_STPCPY = 0])
+AM_COND_IF([GL_COND_OBJ_STPCPY], [
   gl_PREREQ_STPCPY
-fi
+])
 gl_STRING_MODULE_INDICATOR([stpcpy])
 
 Makefile.am:
+if GL_COND_OBJ_STPCPY
+lib_SOURCES += stpcpy.c
+endif
 
 Include:
 <string.h>
diff --git a/modules/stpncpy b/modules/stpncpy
index 25a0c5f2fe..5e95a25c99 100644
--- a/modules/stpncpy
+++ b/modules/stpncpy
@@ -11,13 +11,17 @@ string
 
 configure.ac:
 gl_FUNC_STPNCPY
-if test $HAVE_STPNCPY = 0 || test $REPLACE_STPNCPY = 1; then
-  AC_LIBOBJ([stpncpy])
+gl_CONDITIONAL([GL_COND_OBJ_STPNCPY],
+               [test $HAVE_STPNCPY = 0 || test $REPLACE_STPNCPY = 1])
+AM_COND_IF([GL_COND_OBJ_STPNCPY], [
   gl_PREREQ_STPNCPY
-fi
+])
 gl_STRING_MODULE_INDICATOR([stpncpy])
 
 Makefile.am:
+if GL_COND_OBJ_STPNCPY
+lib_SOURCES += stpncpy.c
+endif
 
 Include:
 <string.h>
diff --git a/modules/strcase b/modules/strcase
index 02ad607d98..faf40578e7 100644
--- a/modules/strcase
+++ b/modules/strcase
@@ -11,16 +11,22 @@ strings
 
 configure.ac:
 gl_STRCASE
-if test $HAVE_STRCASECMP = 0; then
-  AC_LIBOBJ([strcasecmp])
+gl_CONDITIONAL([GL_COND_OBJ_STRCASECMP], [test $HAVE_STRCASECMP = 0])
+AM_COND_IF([GL_COND_OBJ_STRCASECMP], [
   gl_PREREQ_STRCASECMP
-fi
-if test $HAVE_STRNCASECMP = 0; then
-  AC_LIBOBJ([strncasecmp])
+])
+gl_CONDITIONAL([GL_COND_OBJ_STRNCASECMP], [test $HAVE_STRNCASECMP = 0])
+AM_COND_IF([GL_COND_OBJ_STRNCASECMP], [
   gl_PREREQ_STRNCASECMP
-fi
+])
 
 Makefile.am:
+if GL_COND_OBJ_STRCASECMP
+lib_SOURCES += strcasecmp.c
+endif
+if GL_COND_OBJ_STRNCASECMP
+lib_SOURCES += strncasecmp.c
+endif
 
 Include:
 <strings.h>
diff --git a/modules/strchrnul b/modules/strchrnul
index 98a3d8c58a..6c3f088d90 100644
--- a/modules/strchrnul
+++ b/modules/strchrnul
@@ -14,13 +14,17 @@ rawmemchr       [test $HAVE_STRCHRNUL = 0 || test $REPLACE_STRCHRNUL = 1]
 
 configure.ac:
 gl_FUNC_STRCHRNUL
-if test $HAVE_STRCHRNUL = 0 || test $REPLACE_STRCHRNUL = 1; then
-  AC_LIBOBJ([strchrnul])
+gl_CONDITIONAL([GL_COND_OBJ_STRCHRNUL],
+               [test $HAVE_STRCHRNUL = 0 || test $REPLACE_STRCHRNUL = 1])
+AM_COND_IF([GL_COND_OBJ_STRCHRNUL], [
   gl_PREREQ_STRCHRNUL
-fi
+])
 gl_STRING_MODULE_INDICATOR([strchrnul])
 
 Makefile.am:
+if GL_COND_OBJ_STRCHRNUL
+lib_SOURCES += strchrnul.c
+endif
 
 Include:
 <string.h>
diff --git a/modules/strcspn b/modules/strcspn
index a0392bcc4b..c6843396b8 100644
--- a/modules/strcspn
+++ b/modules/strcspn
@@ -15,12 +15,15 @@ Depends-on:
 
 configure.ac:
 gl_FUNC_STRCSPN
-if test $ac_cv_func_strcspn = no; then
-  AC_LIBOBJ([strcspn])
+gl_CONDITIONAL([GL_COND_OBJ_STRCSPN], [test $ac_cv_func_strcspn = no])
+AM_COND_IF([GL_COND_OBJ_STRCSPN], [
   gl_PREREQ_STRCSPN
-fi
+])
 
 Makefile.am:
+if GL_COND_OBJ_STRCSPN
+lib_SOURCES += strcspn.c
+endif
 
 Include:
 <string.h>
diff --git a/modules/strdup-posix b/modules/strdup-posix
index a6381f7ac3..5eab0ed415 100644
--- a/modules/strdup-posix
+++ b/modules/strdup-posix
@@ -11,13 +11,16 @@ malloc-posix    [test $REPLACE_STRDUP = 1]
 
 configure.ac:
 gl_FUNC_STRDUP_POSIX
-if test $REPLACE_STRDUP = 1; then
-  AC_LIBOBJ([strdup])
+gl_CONDITIONAL([GL_COND_OBJ_STRDUP], [test $REPLACE_STRDUP = 1])
+AM_COND_IF([GL_COND_OBJ_STRDUP], [
   gl_PREREQ_STRDUP
-fi
+])
 gl_STRING_MODULE_INDICATOR([strdup])
 
 Makefile.am:
+if GL_COND_OBJ_STRDUP
+lib_SOURCES += strdup.c
+endif
 
 Include:
 <string.h>
diff --git a/modules/strerror b/modules/strerror
index 1d60662b7c..6ed290e929 100644
--- a/modules/strerror
+++ b/modules/strerror
@@ -14,13 +14,14 @@ verify           [test $REPLACE_STRERROR = 1]
 
 configure.ac:
 gl_FUNC_STRERROR
-if test $REPLACE_STRERROR = 1; then
-  AC_LIBOBJ([strerror])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_STRERROR], [test $REPLACE_STRERROR = 1])
 gl_MODULE_INDICATOR([strerror])
 gl_STRING_MODULE_INDICATOR([strerror])
 
 Makefile.am:
+if GL_COND_OBJ_STRERROR
+lib_SOURCES += strerror.c
+endif
 
 Include:
 <string.h>
diff --git a/modules/strerror-override b/modules/strerror-override
index 0b72b46cf3..a17464a546 100644
--- a/modules/strerror-override
+++ b/modules/strerror-override
@@ -13,12 +13,16 @@ errno
 configure.ac:
 AC_REQUIRE([gl_HEADER_ERRNO_H])
 AC_REQUIRE([gl_FUNC_STRERROR_0])
-if test -n "$ERRNO_H" || test $REPLACE_STRERROR_0 = 1; then
-  AC_LIBOBJ([strerror-override])
+gl_CONDITIONAL([GL_COND_OBJ_STRERROR_OVERRIDE],
+               [test -n "$ERRNO_H" || test $REPLACE_STRERROR_0 = 1])
+AM_COND_IF([GL_COND_OBJ_STRERROR_OVERRIDE], [
   gl_PREREQ_SYS_H_WINSOCK2
-fi
+])
 
 Makefile.am:
+if GL_COND_OBJ_STRERROR_OVERRIDE
+lib_SOURCES += strerror-override.c
+endif
 
 Include:
 "strerror-override.h"
diff --git a/modules/strerrorname_np b/modules/strerrorname_np
index 41abf308e3..03e5e7de48 100644
--- a/modules/strerrorname_np
+++ b/modules/strerrorname_np
@@ -11,12 +11,14 @@ string
 
 configure.ac:
 gl_FUNC_STRERRORNAME_NP
-if test $HAVE_STRERRORNAME_NP = 0 || test $REPLACE_STRERRORNAME_NP = 1; then
-  AC_LIBOBJ([strerrorname_np])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_STRERRORNAME_NP],
+               [test $HAVE_STRERRORNAME_NP = 0 || test $REPLACE_STRERRORNAME_NP = 1])
 gl_STRING_MODULE_INDICATOR([strerrorname_np])
 
 Makefile.am:
+if GL_COND_OBJ_STRERRORNAME_NP
+lib_SOURCES += strerrorname_np.c
+endif
 
 Include:
 <string.h>
diff --git a/modules/strfmon_l b/modules/strfmon_l
index 62f665fcdc..31dafe748d 100644
--- a/modules/strfmon_l
+++ b/modules/strfmon_l
@@ -14,13 +14,16 @@ stdbool         [test $REPLACE_STRFMON_L = 1]
 
 configure.ac:
 gl_FUNC_STRFMON_L
-if test $REPLACE_STRFMON_L = 1; then
-  AC_LIBOBJ([strfmon_l])
+gl_CONDITIONAL([GL_COND_OBJ_STRFMON_L], [test $REPLACE_STRFMON_L = 1])
+AM_COND_IF([GL_COND_OBJ_STRFMON_L], [
   gl_PREREQ_STRFMON_L
-fi
+])
 gl_MONETARY_MODULE_INDICATOR([strfmon_l])
 
 Makefile.am:
+if GL_COND_OBJ_STRFMON_L
+lib_SOURCES += strfmon_l.c
+endif
 
 Include:
 #if HAVE_MONETARY_H
diff --git a/modules/strftime-fixes b/modules/strftime-fixes
index 4a7bebf666..38a17fcfc3 100644
--- a/modules/strftime-fixes
+++ b/modules/strftime-fixes
@@ -10,12 +10,13 @@ time
 
 configure.ac:
 gl_FUNC_STRFTIME
-if test $REPLACE_STRFTIME = 1; then
-  AC_LIBOBJ([strftime-fixes])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_STRFTIME_FIXES], [test $REPLACE_STRFTIME = 1])
 gl_TIME_MODULE_INDICATOR([strftime])
 
 Makefile.am:
+if GL_COND_OBJ_STRFTIME_FIXES
+lib_SOURCES += strftime-fixes.c
+endif
 
 Include:
 <time.h>
diff --git a/modules/strncat b/modules/strncat
index 8dc19d92e2..eacd0a4029 100644
--- a/modules/strncat
+++ b/modules/strncat
@@ -11,13 +11,16 @@ string
 
 configure.ac:
 gl_FUNC_STRNCAT
-if test $REPLACE_STRNCAT = 1; then
-  AC_LIBOBJ([strncat])
+gl_CONDITIONAL([GL_COND_OBJ_STRNCAT], [test $REPLACE_STRNCAT = 1])
+AM_COND_IF([GL_COND_OBJ_STRNCAT], [
   gl_PREREQ_STRNCAT
-fi
+])
 gl_STRING_MODULE_INDICATOR([strncat])
 
 Makefile.am:
+if GL_COND_OBJ_STRNCAT
+lib_SOURCES += strncat.c
+endif
 
 Include:
 <string.h>
diff --git a/modules/strndup b/modules/strndup
index 4cb5a903c5..af1214817a 100644
--- a/modules/strndup
+++ b/modules/strndup
@@ -12,12 +12,14 @@ strnlen         [test $HAVE_STRNDUP = 0 || test $REPLACE_STRNDUP = 1]
 
 configure.ac:
 gl_FUNC_STRNDUP
-if test $HAVE_STRNDUP = 0 || test $REPLACE_STRNDUP = 1; then
-  AC_LIBOBJ([strndup])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_STRNDUP],
+               [test $HAVE_STRNDUP = 0 || test $REPLACE_STRNDUP = 1])
 gl_STRING_MODULE_INDICATOR([strndup])
 
 Makefile.am:
+if GL_COND_OBJ_STRNDUP
+lib_SOURCES += strndup.c
+endif
 
 Include:
 <string.h>
diff --git a/modules/strnlen b/modules/strnlen
index ea5658a072..3ef0b850f4 100644
--- a/modules/strnlen
+++ b/modules/strnlen
@@ -11,14 +11,18 @@ extensions
 
 configure.ac:
 gl_FUNC_STRNLEN
-if test $HAVE_DECL_STRNLEN = 0 || test $REPLACE_STRNLEN = 1; then
-  AC_LIBOBJ([strnlen])
+gl_CONDITIONAL([GL_COND_OBJ_STRNLEN],
+               [test $HAVE_DECL_STRNLEN = 0 || test $REPLACE_STRNLEN = 1])
+AM_COND_IF([GL_COND_OBJ_STRNLEN], [
   gl_PREREQ_STRNLEN
-fi
+])
 
 gl_STRING_MODULE_INDICATOR([strnlen])
 
 Makefile.am:
+if GL_COND_OBJ_STRNLEN
+lib_SOURCES += strnlen.c
+endif
 
 Include:
 <string.h>
diff --git a/modules/strpbrk b/modules/strpbrk
index 09a2ebc236..76c0626c6c 100644
--- a/modules/strpbrk
+++ b/modules/strpbrk
@@ -16,13 +16,16 @@ string
 
 configure.ac:
 gl_FUNC_STRPBRK
-if test $HAVE_STRPBRK = 0; then
-  AC_LIBOBJ([strpbrk])
+gl_CONDITIONAL([GL_COND_OBJ_STRPBRK], [test $HAVE_STRPBRK = 0])
+AM_COND_IF([GL_COND_OBJ_STRPBRK], [
   gl_PREREQ_STRPBRK
-fi
+])
 gl_STRING_MODULE_INDICATOR([strpbrk])
 
 Makefile.am:
+if GL_COND_OBJ_STRPBRK
+lib_SOURCES += strpbrk.c
+endif
 
 Include:
 <string.h>
diff --git a/modules/strptime b/modules/strptime
index a69d583db8..bcbfa27782 100644
--- a/modules/strptime
+++ b/modules/strptime
@@ -17,13 +17,16 @@ time_r          [test $HAVE_STRPTIME = 0]
 
 configure.ac:
 gl_FUNC_STRPTIME
-if test $HAVE_STRPTIME = 0; then
-  AC_LIBOBJ([strptime])
+gl_CONDITIONAL([GL_COND_OBJ_STRPTIME], [test $HAVE_STRPTIME = 0])
+AM_COND_IF([GL_COND_OBJ_STRPTIME], [
   gl_PREREQ_STRPTIME
-fi
+])
 gl_TIME_MODULE_INDICATOR([strptime])
 
 Makefile.am:
+if GL_COND_OBJ_STRPTIME
+lib_SOURCES += strptime.c
+endif
 
 Include:
 <time.h>
diff --git a/modules/strsep b/modules/strsep
index 825cd197a6..9717202f12 100644
--- a/modules/strsep
+++ b/modules/strsep
@@ -12,13 +12,16 @@ strpbrk         [test $HAVE_STRSEP = 0]
 
 configure.ac:
 gl_FUNC_STRSEP
-if test $HAVE_STRSEP = 0; then
-  AC_LIBOBJ([strsep])
+gl_CONDITIONAL([GL_COND_OBJ_STRSEP], [test $HAVE_STRSEP = 0])
+AM_COND_IF([GL_COND_OBJ_STRSEP], [
   gl_PREREQ_STRSEP
-fi
+])
 gl_STRING_MODULE_INDICATOR([strsep])
 
 Makefile.am:
+if GL_COND_OBJ_STRSEP
+lib_SOURCES += strsep.c
+endif
 
 Include:
 <string.h>
diff --git a/modules/strsignal b/modules/strsignal
index bdb68fad2f..50a9484115 100644
--- a/modules/strsignal
+++ b/modules/strsignal
@@ -17,13 +17,17 @@ memset          [test $HAVE_STRSIGNAL = 0 || test $REPLACE_STRSIGNAL = 1]
 
 configure.ac:
 gl_FUNC_STRSIGNAL
-if test $HAVE_STRSIGNAL = 0 || test $REPLACE_STRSIGNAL = 1; then
-  AC_LIBOBJ([strsignal])
+gl_CONDITIONAL([GL_COND_OBJ_STRSIGNAL],
+               [test $HAVE_STRSIGNAL = 0 || test $REPLACE_STRSIGNAL = 1])
+AM_COND_IF([GL_COND_OBJ_STRSIGNAL], [
   gl_PREREQ_STRSIGNAL
-fi
+])
 gl_STRING_MODULE_INDICATOR([strsignal])
 
 Makefile.am:
+if GL_COND_OBJ_STRSIGNAL
+lib_SOURCES += strsignal.c
+endif
 
 Include:
 <string.h>
diff --git a/modules/strtod b/modules/strtod
index 7c7c4e0471..7fcea82a30 100644
--- a/modules/strtod
+++ b/modules/strtod
@@ -15,13 +15,17 @@ stdbool         [test $HAVE_STRTOD = 0 || test $REPLACE_STRTOD = 1]
 
 configure.ac:
 gl_FUNC_STRTOD
-if test $HAVE_STRTOD = 0 || test $REPLACE_STRTOD = 1; then
-  AC_LIBOBJ([strtod])
+gl_CONDITIONAL([GL_COND_OBJ_STRTOD],
+               [test $HAVE_STRTOD = 0 || test $REPLACE_STRTOD = 1])
+AM_COND_IF([GL_COND_OBJ_STRTOD], [
   gl_PREREQ_STRTOD
-fi
+])
 gl_STDLIB_MODULE_INDICATOR([strtod])
 
 Makefile.am:
+if GL_COND_OBJ_STRTOD
+lib_SOURCES += strtod.c
+endif
 
 Include:
 <stdlib.h>
diff --git a/modules/strtoimax b/modules/strtoimax
index 1cdd92579e..80aa1dde65 100644
--- a/modules/strtoimax
+++ b/modules/strtoimax
@@ -13,13 +13,17 @@ strtoll         [{ test $HAVE_DECL_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1;
 
 configure.ac:
 gl_FUNC_STRTOIMAX
-if test $HAVE_DECL_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1; then
-  AC_LIBOBJ([strtoimax])
+gl_CONDITIONAL([GL_COND_OBJ_STRTOIMAX],
+               [test $HAVE_DECL_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1])
+AM_COND_IF([GL_COND_OBJ_STRTOIMAX], [
   gl_PREREQ_STRTOIMAX
-fi
+])
 gl_INTTYPES_MODULE_INDICATOR([strtoimax])
 
 Makefile.am:
+if GL_COND_OBJ_STRTOIMAX
+lib_SOURCES += strtoimax.c
+endif
 
 Include:
 <inttypes.h>
diff --git a/modules/strtok_r b/modules/strtok_r
index 23a6acbedc..32ac475c6d 100644
--- a/modules/strtok_r
+++ b/modules/strtok_r
@@ -11,13 +11,17 @@ strpbrk         [test $HAVE_STRTOK_R = 0 || test $REPLACE_STRTOK_R = 1]
 
 configure.ac:
 gl_FUNC_STRTOK_R
-if test $HAVE_STRTOK_R = 0 || test $REPLACE_STRTOK_R = 1; then
-  AC_LIBOBJ([strtok_r])
+gl_CONDITIONAL([GL_COND_OBJ_STRTOK_R],
+               [test $HAVE_STRTOK_R = 0 || test $REPLACE_STRTOK_R = 1])
+AM_COND_IF([GL_COND_OBJ_STRTOK_R], [
   gl_PREREQ_STRTOK_R
-fi
+])
 gl_STRING_MODULE_INDICATOR([strtok_r])
 
 Makefile.am:
+if GL_COND_OBJ_STRTOK_R
+lib_SOURCES += strtok_r.c
+endif
 
 Include:
 <string.h>
diff --git a/modules/strtol b/modules/strtol
index 24d4c734db..c875b3b354 100644
--- a/modules/strtol
+++ b/modules/strtol
@@ -10,12 +10,14 @@ stdlib
 
 configure.ac:
 gl_FUNC_STRTOL
-if test $HAVE_STRTOL = 0 || test $REPLACE_STRTOL = 1; then
-  AC_LIBOBJ([strtol])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_STRTOL],
+               [test $HAVE_STRTOL = 0 || test $REPLACE_STRTOL = 1])
 gl_STDLIB_MODULE_INDICATOR([strtol])
 
 Makefile.am:
+if GL_COND_OBJ_STRTOL
+lib_SOURCES += strtol.c
+endif
 
 Include:
 <stdlib.h>
diff --git a/modules/strtold b/modules/strtold
index f99b9e6ae2..ee637cb464 100644
--- a/modules/strtold
+++ b/modules/strtold
@@ -17,13 +17,17 @@ strtod          [{ test $HAVE_STRTOLD = 0 || test $REPLACE_STRTOLD = 1; } && tes
 
 configure.ac:
 gl_FUNC_STRTOLD
-if test $HAVE_STRTOLD = 0 || test $REPLACE_STRTOLD = 1; then
-  AC_LIBOBJ([strtold])
+gl_CONDITIONAL([GL_COND_OBJ_STRTOLD],
+               [test $HAVE_STRTOLD = 0 || test $REPLACE_STRTOLD = 1])
+AM_COND_IF([GL_COND_OBJ_STRTOLD], [
   gl_PREREQ_STRTOLD
-fi
+])
 gl_STDLIB_MODULE_INDICATOR([strtold])
 
 Makefile.am:
+if GL_COND_OBJ_STRTOLD
+lib_SOURCES += strtold.c
+endif
 
 Include:
 <stdlib.h>
diff --git a/modules/strtoll b/modules/strtoll
index da5a5a157a..5d00f5c3d3 100644
--- a/modules/strtoll
+++ b/modules/strtoll
@@ -12,13 +12,17 @@ stdlib
 
 configure.ac:
 gl_FUNC_STRTOLL
-if test $HAVE_STRTOLL = 0 || test $REPLACE_STRTOLL = 1; then
-  AC_LIBOBJ([strtoll])
+gl_CONDITIONAL([GL_COND_OBJ_STRTOLL],
+               [test $HAVE_STRTOLL = 0 || test $REPLACE_STRTOLL = 1])
+AM_COND_IF([GL_COND_OBJ_STRTOLL], [
   gl_PREREQ_STRTOLL
-fi
+])
 gl_STDLIB_MODULE_INDICATOR([strtoll])
 
 Makefile.am:
+if GL_COND_OBJ_STRTOLL
+lib_SOURCES += strtoll.c
+endif
 
 Include:
 <stdlib.h>
diff --git a/modules/strtoul b/modules/strtoul
index c790e41f78..484beb6cf3 100644
--- a/modules/strtoul
+++ b/modules/strtoul
@@ -11,12 +11,14 @@ stdlib
 
 configure.ac:
 gl_FUNC_STRTOUL
-if test $HAVE_STRTOUL = 0 || test $REPLACE_STRTOUL = 1; then
-  AC_LIBOBJ([strtoul])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_STRTOUL],
+               [test $HAVE_STRTOUL = 0 || test $REPLACE_STRTOUL = 1])
 gl_STDLIB_MODULE_INDICATOR([strtoul])
 
 Makefile.am:
+if GL_COND_OBJ_STRTOUL
+lib_SOURCES += strtoul.c
+endif
 
 Include:
 <stdlib.h>
diff --git a/modules/strtoull b/modules/strtoull
index 9b5895b5c7..8beb6a7dac 100644
--- a/modules/strtoull
+++ b/modules/strtoull
@@ -13,13 +13,17 @@ stdlib
 
 configure.ac:
 gl_FUNC_STRTOULL
-if test $HAVE_STRTOULL = 0 || test $REPLACE_STRTOULL = 1; then
-  AC_LIBOBJ([strtoull])
+gl_CONDITIONAL([GL_COND_OBJ_STRTOULL],
+               [test $HAVE_STRTOULL = 0 || test $REPLACE_STRTOULL = 1])
+AM_COND_IF([GL_COND_OBJ_STRTOULL], [
   gl_PREREQ_STRTOULL
-fi
+])
 gl_STDLIB_MODULE_INDICATOR([strtoull])
 
 Makefile.am:
+if GL_COND_OBJ_STRTOULL
+lib_SOURCES += strtoull.c
+endif
 
 Include:
 <stdlib.h>
diff --git a/modules/strtoumax b/modules/strtoumax
index 201332ca09..3d6bbf7281 100644
--- a/modules/strtoumax
+++ b/modules/strtoumax
@@ -14,13 +14,17 @@ strtoull        [{ test $HAVE_DECL_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1;
 
 configure.ac:
 gl_FUNC_STRTOUMAX
-if test $HAVE_DECL_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1; then
-  AC_LIBOBJ([strtoumax])
+gl_CONDITIONAL([GL_COND_OBJ_STRTOUMAX],
+               [test $HAVE_DECL_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1])
+AM_COND_IF([GL_COND_OBJ_STRTOUMAX], [
   gl_PREREQ_STRTOUMAX
-fi
+])
 gl_INTTYPES_MODULE_INDICATOR([strtoumax])
 
 Makefile.am:
+if GL_COND_OBJ_STRTOUMAX
+lib_SOURCES += strtoumax.c
+endif
 
 Include:
 <inttypes.h>
diff --git a/modules/strverscmp b/modules/strverscmp
index c2eefd5200..a80d1dd1d7 100644
--- a/modules/strverscmp
+++ b/modules/strverscmp
@@ -13,13 +13,16 @@ string
 
 configure.ac:
 gl_FUNC_STRVERSCMP
-if test $HAVE_STRVERSCMP = 0; then
-  AC_LIBOBJ([strverscmp])
+gl_CONDITIONAL([GL_COND_OBJ_STRVERSCMP], [test $HAVE_STRVERSCMP = 0])
+AM_COND_IF([GL_COND_OBJ_STRVERSCMP], [
   gl_PREREQ_STRVERSCMP
-fi
+])
 gl_STRING_MODULE_INDICATOR([strverscmp])
 
 Makefile.am:
+if GL_COND_OBJ_STRVERSCMP
+lib_SOURCES += strverscmp.c
+endif
 
 Include:
 <string.h>
diff --git a/modules/symlink b/modules/symlink
index f6f1db2d79..a54e4e2ab3 100644
--- a/modules/symlink
+++ b/modules/symlink
@@ -11,12 +11,14 @@ lstat           [test $HAVE_SYMLINK = 0 || test $REPLACE_SYMLINK = 1]
 
 configure.ac:
 gl_FUNC_SYMLINK
-if test $HAVE_SYMLINK = 0 || test $REPLACE_SYMLINK = 1; then
-  AC_LIBOBJ([symlink])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_SYMLINK],
+               [test $HAVE_SYMLINK = 0 || test $REPLACE_SYMLINK = 1])
 gl_UNISTD_MODULE_INDICATOR([symlink])
 
 Makefile.am:
+if GL_COND_OBJ_SYMLINK
+lib_SOURCES += symlink.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/symlinkat b/modules/symlinkat
index 03b6a40f46..61b861e813 100644
--- a/modules/symlinkat
+++ b/modules/symlinkat
@@ -22,12 +22,14 @@ fstatat         [test $REPLACE_SYMLINKAT = 1]
 
 configure.ac:
 gl_FUNC_SYMLINKAT
-if test $HAVE_SYMLINKAT = 0 || test $REPLACE_SYMLINKAT = 1; then
-  AC_LIBOBJ([symlinkat])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_SYMLINKAT],
+               [test $HAVE_SYMLINKAT = 0 || test $REPLACE_SYMLINKAT = 1])
 gl_UNISTD_MODULE_INDICATOR([symlinkat])
 
 Makefile.am:
+if GL_COND_OBJ_SYMLINKAT
+lib_SOURCES += symlinkat.c
+endif
 
 Include:
 <fcntl.h>
diff --git a/modules/tanf b/modules/tanf
index b2724957d4..64b4cbcc72 100644
--- a/modules/tanf
+++ b/modules/tanf
@@ -12,12 +12,13 @@ tan             [test $HAVE_TANF = 0]
 
 configure.ac:
 gl_FUNC_TANF
-if test $HAVE_TANF = 0; then
-  AC_LIBOBJ([tanf])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_TANF], [test $HAVE_TANF = 0])
 gl_MATH_MODULE_INDICATOR([tanf])
 
 Makefile.am:
+if GL_COND_OBJ_TANF
+lib_SOURCES += tanf.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/tanhf b/modules/tanhf
index 9e90a39f58..84a3916258 100644
--- a/modules/tanhf
+++ b/modules/tanhf
@@ -12,12 +12,13 @@ tanh            [test $HAVE_TANHF = 0]
 
 configure.ac:
 gl_FUNC_TANHF
-if test $HAVE_TANHF = 0; then
-  AC_LIBOBJ([tanhf])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_TANHF], [test $HAVE_TANHF = 0])
 gl_MATH_MODULE_INDICATOR([tanhf])
 
 Makefile.am:
+if GL_COND_OBJ_TANHF
+lib_SOURCES += tanhf.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/tanl b/modules/tanl
index c91c6fe023..95fe8ba08e 100644
--- a/modules/tanl
+++ b/modules/tanl
@@ -18,15 +18,18 @@ floorl          [test $HAVE_TANL = 0 && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE =
 
 configure.ac:
 gl_FUNC_TANL
-if test $HAVE_TANL = 0; then
-  AC_LIBOBJ([tanl])
+gl_CONDITIONAL([GL_COND_OBJ_TANL], [test $HAVE_TANL = 0])
+AM_COND_IF([GL_COND_OBJ_TANL], [
   if test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0; then
     AC_LIBOBJ([trigl])
   fi
-fi
+])
 gl_MATH_MODULE_INDICATOR([tanl])
 
 Makefile.am:
+if GL_COND_OBJ_TANL
+lib_SOURCES += tanl.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/tcgetsid b/modules/tcgetsid
index 21fd04768b..67e74cabf7 100644
--- a/modules/tcgetsid
+++ b/modules/tcgetsid
@@ -13,13 +13,16 @@ sys_ioctl       [test $HAVE_TCGETSID = 0]
 
 configure.ac:
 gl_FUNC_TCGETSID
-if test $HAVE_TCGETSID = 0; then
-  AC_LIBOBJ([tcgetsid])
+gl_CONDITIONAL([GL_COND_OBJ_TCGETSID], [test $HAVE_TCGETSID = 0])
+AM_COND_IF([GL_COND_OBJ_TCGETSID], [
   gl_PREREQ_TCGETSID
-fi
+])
 gl_TERMIOS_MODULE_INDICATOR([tcgetsid])
 
 Makefile.am:
+if GL_COND_OBJ_TCGETSID
+lib_SOURCES += tcgetsid.c
+endif
 
 Include:
 <termios.h>
diff --git a/modules/thrd b/modules/thrd
index 388e0ea33b..cbb98f9491 100644
--- a/modules/thrd
+++ b/modules/thrd
@@ -13,12 +13,14 @@ nanosleep
 configure.ac:
 AC_REQUIRE([gl_THREADS_H])
 gl_FUNC_THRD_JOIN
-if test $HAVE_THREADS_H = 0 || test $REPLACE_THRD_CREATE = 1 || test $REPLACE_THRD_JOIN = 1; then
-  AC_LIBOBJ([thrd])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_THRD],
+               [test $HAVE_THREADS_H = 0 || test $REPLACE_THRD_CREATE = 1 || test $REPLACE_THRD_JOIN = 1])
 gl_THREADS_MODULE_INDICATOR([thrd])
 
 Makefile.am:
+if GL_COND_OBJ_THRD
+lib_SOURCES += thrd.c
+endif
 
 Include:
 <threads.h>
diff --git a/modules/time_r b/modules/time_r
index c235e08bb2..6f11b65c95 100644
--- a/modules/time_r
+++ b/modules/time_r
@@ -11,13 +11,17 @@ time
 
 configure.ac:
 gl_TIME_R
-if test $HAVE_LOCALTIME_R = 0 || test $REPLACE_LOCALTIME_R = 1; then
-  AC_LIBOBJ([time_r])
+gl_CONDITIONAL([GL_COND_OBJ_TIME_R],
+               [test $HAVE_LOCALTIME_R = 0 || test $REPLACE_LOCALTIME_R = 1])
+AM_COND_IF([GL_COND_OBJ_TIME_R], [
   gl_PREREQ_TIME_R
-fi
+])
 gl_TIME_MODULE_INDICATOR([time_r])
 
 Makefile.am:
+if GL_COND_OBJ_TIME_R
+lib_SOURCES += time_r.c
+endif
 
 Include:
 <time.h>
diff --git a/modules/time_rz b/modules/time_rz
index ebcef84fff..fe8a33e699 100644
--- a/modules/time_rz
+++ b/modules/time_rz
@@ -21,12 +21,13 @@ unsetenv       [test $HAVE_TIMEZONE_T = 0]
 
 configure.ac:
 gl_TIME_RZ
-if test $HAVE_TIMEZONE_T = 0; then
-  AC_LIBOBJ([time_rz])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_TIME_RZ], [test $HAVE_TIMEZONE_T = 0])
 gl_TIME_MODULE_INDICATOR([time_rz])
 
 Makefile.am:
+if GL_COND_OBJ_TIME_RZ
+lib_SOURCES += time_rz.c
+endif
 
 Include:
 <time.h>
diff --git a/modules/timegm b/modules/timegm
index 0ec9d65e7b..3d8771e58d 100644
--- a/modules/timegm
+++ b/modules/timegm
@@ -13,13 +13,17 @@ time_r          [test $HAVE_TIMEGM = 0 || test $REPLACE_TIMEGM = 1]
 
 configure.ac:
 gl_FUNC_TIMEGM
-if test $HAVE_TIMEGM = 0 || test $REPLACE_TIMEGM = 1; then
-  AC_LIBOBJ([timegm])
+gl_CONDITIONAL([GL_COND_OBJ_TIMEGM],
+               [test $HAVE_TIMEGM = 0 || test $REPLACE_TIMEGM = 1])
+AM_COND_IF([GL_COND_OBJ_TIMEGM], [
   gl_PREREQ_TIMEGM
-fi
+])
 gl_TIME_MODULE_INDICATOR([timegm])
 
 Makefile.am:
+if GL_COND_OBJ_TIMEGM
+lib_SOURCES += timegm.c
+endif
 
 Include:
 <time.h>
diff --git a/modules/times b/modules/times
index aab3703f6a..4b15d0f8b8 100644
--- a/modules/times
+++ b/modules/times
@@ -10,12 +10,13 @@ sys_times
 
 configure.ac:
 gl_FUNC_TIMES
-if test $HAVE_TIMES = 0; then
-  AC_LIBOBJ([times])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_TIMES], [test $HAVE_TIMES = 0])
 gl_SYS_TIMES_MODULE_INDICATOR([times])
 
 Makefile.am:
+if GL_COND_OBJ_TIMES
+lib_SOURCES += times.c
+endif
 
 Include:
 <sys/times.h>
diff --git a/modules/timespec_get b/modules/timespec_get
index 51efed3d7c..99ef6e8afc 100644
--- a/modules/timespec_get
+++ b/modules/timespec_get
@@ -12,12 +12,13 @@ gettime         [test $HAVE_TIMESPEC_GET = 0]
 
 configure.ac:
 gl_FUNC_TIMESPEC_GET
-if test $HAVE_TIMESPEC_GET = 0; then
-  AC_LIBOBJ([timespec_get])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_TIMESPEC_GET], [test $HAVE_TIMESPEC_GET = 0])
 gl_TIME_MODULE_INDICATOR([timespec_get])
 
 Makefile.am:
+if GL_COND_OBJ_TIMESPEC_GET
+lib_SOURCES += timespec_get.c
+endif
 
 Include:
 <time.h>
diff --git a/modules/timespec_getres b/modules/timespec_getres
index f9672868e3..026eb0772d 100644
--- a/modules/timespec_getres
+++ b/modules/timespec_getres
@@ -12,12 +12,13 @@ gettime-res     [test $HAVE_TIMESPEC_GETRES = 0]
 
 configure.ac:
 AC_REQUIRE([gl_FUNC_TIMESPEC_GETRES])
-if test $HAVE_TIMESPEC_GETRES = 0; then
-  AC_LIBOBJ([timespec_getres])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_TIMESPEC_GETRES], [test $HAVE_TIMESPEC_GETRES = 0])
 gl_TIME_MODULE_INDICATOR([timespec_getres])
 
 Makefile.am:
+if GL_COND_OBJ_TIMESPEC_GETRES
+lib_SOURCES += timespec_getres.c
+endif
 
 Include:
 <time.h>
diff --git a/modules/tmpfile b/modules/tmpfile
index fc71e2db9b..fc65fa581e 100644
--- a/modules/tmpfile
+++ b/modules/tmpfile
@@ -15,13 +15,16 @@ tmpdir          [test $REPLACE_TMPFILE = 1]
 
 configure.ac:
 gl_FUNC_TMPFILE
-if test $REPLACE_TMPFILE = 1; then
-  AC_LIBOBJ([tmpfile])
+gl_CONDITIONAL([GL_COND_OBJ_TMPFILE], [test $REPLACE_TMPFILE = 1])
+AM_COND_IF([GL_COND_OBJ_TMPFILE], [
   gl_PREREQ_TMPFILE
-fi
+])
 gl_STDIO_MODULE_INDICATOR([tmpfile])
 
 Makefile.am:
+if GL_COND_OBJ_TMPFILE
+lib_SOURCES += tmpfile.c
+endif
 
 Include:
 <stdio.h>
diff --git a/modules/towctrans b/modules/towctrans
index 0d02daf114..7a58232303 100644
--- a/modules/towctrans
+++ b/modules/towctrans
@@ -11,12 +11,13 @@ wctype-h
 
 configure.ac:
 gl_FUNC_TOWCTRANS
-if test $HAVE_TOWCTRANS = 0; then
-  AC_LIBOBJ([towctrans])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_TOWCTRANS], [test $HAVE_TOWCTRANS = 0])
 gl_WCTYPE_MODULE_INDICATOR([towctrans])
 
 Makefile.am:
+if GL_COND_OBJ_TOWCTRANS
+lib_SOURCES += towctrans.c
+endif
 
 Include:
 <wctype.h>
diff --git a/modules/trunc b/modules/trunc
index bd95586795..2cf4f40bc6 100644
--- a/modules/trunc
+++ b/modules/trunc
@@ -12,12 +12,14 @@ float           [test $HAVE_DECL_TRUNC = 0 || test $REPLACE_TRUNC = 1]
 
 configure.ac:
 gl_FUNC_TRUNC
-if test $HAVE_DECL_TRUNC = 0 || test $REPLACE_TRUNC = 1; then
-  AC_LIBOBJ([trunc])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_TRUNC],
+               [test $HAVE_DECL_TRUNC = 0 || test $REPLACE_TRUNC = 1])
 gl_MATH_MODULE_INDICATOR([trunc])
 
 Makefile.am:
+if GL_COND_OBJ_TRUNC
+lib_SOURCES += trunc.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/truncate b/modules/truncate
index 82814fe83a..c6a108720b 100644
--- a/modules/truncate
+++ b/modules/truncate
@@ -16,13 +16,17 @@ ftruncate       [test $HAVE_DECL_TRUNCATE = 0 || test $REPLACE_TRUNCATE = 1]
 
 configure.ac:
 gl_FUNC_TRUNCATE
-if test $HAVE_DECL_TRUNCATE = 0 || test $REPLACE_TRUNCATE = 1; then
-  AC_LIBOBJ([truncate])
+gl_CONDITIONAL([GL_COND_OBJ_TRUNCATE],
+               [test $HAVE_DECL_TRUNCATE = 0 || test $REPLACE_TRUNCATE = 1])
+AM_COND_IF([GL_COND_OBJ_TRUNCATE], [
   gl_PREREQ_TRUNCATE
-fi
+])
 gl_UNISTD_MODULE_INDICATOR([truncate])
 
 Makefile.am:
+if GL_COND_OBJ_TRUNCATE
+lib_SOURCES += truncate.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/truncf b/modules/truncf
index 24e3eb2b9e..d45ff14766 100644
--- a/modules/truncf
+++ b/modules/truncf
@@ -13,12 +13,14 @@ float           [test $HAVE_DECL_TRUNCF = 0 || test $REPLACE_TRUNCF = 1]
 
 configure.ac:
 gl_FUNC_TRUNCF
-if test $HAVE_DECL_TRUNCF = 0 || test $REPLACE_TRUNCF = 1; then
-  AC_LIBOBJ([truncf])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_TRUNCF],
+               [test $HAVE_DECL_TRUNCF = 0 || test $REPLACE_TRUNCF = 1])
 gl_MATH_MODULE_INDICATOR([truncf])
 
 Makefile.am:
+if GL_COND_OBJ_TRUNCF
+lib_SOURCES += truncf.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/truncl b/modules/truncl
index 49ae30fa29..54e26903ad 100644
--- a/modules/truncl
+++ b/modules/truncl
@@ -14,12 +14,14 @@ float           [{ test $HAVE_DECL_TRUNCL = 0 || test $REPLACE_TRUNCL = 1; } &&
 
 configure.ac:
 gl_FUNC_TRUNCL
-if test $HAVE_DECL_TRUNCL = 0 || test $REPLACE_TRUNCL = 1; then
-  AC_LIBOBJ([truncl])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_TRUNCL],
+               [test $HAVE_DECL_TRUNCL = 0 || test $REPLACE_TRUNCL = 1])
 gl_MATH_MODULE_INDICATOR([truncl])
 
 Makefile.am:
+if GL_COND_OBJ_TRUNCL
+lib_SOURCES += truncl.c
+endif
 
 Include:
 <math.h>
diff --git a/modules/tsearch b/modules/tsearch
index 6ffdf2f9bb..91ef56c8c0 100644
--- a/modules/tsearch
+++ b/modules/tsearch
@@ -10,13 +10,17 @@ search
 
 configure.ac:
 gl_FUNC_TSEARCH
-if test $HAVE_TSEARCH = 0 || test $HAVE_TWALK = 0 || test $REPLACE_TSEARCH = 1; then
-  AC_LIBOBJ([tsearch])
+gl_CONDITIONAL([GL_COND_OBJ_TSEARCH],
+               [test $HAVE_TSEARCH = 0 || test $HAVE_TWALK = 0 || test $REPLACE_TSEARCH = 1])
+AM_COND_IF([GL_COND_OBJ_TSEARCH], [
   gl_PREREQ_TSEARCH
-fi
+])
 gl_SEARCH_MODULE_INDICATOR([tsearch])
 
 Makefile.am:
+if GL_COND_OBJ_TSEARCH
+lib_SOURCES += tsearch.c
+endif
 
 Include:
 <search.h>
diff --git a/modules/tss b/modules/tss
index d751724842..8cdb448f23 100644
--- a/modules/tss
+++ b/modules/tss
@@ -10,12 +10,13 @@ windows-tls
 
 configure.ac:
 AC_REQUIRE([gl_THREADS_H])
-if test $HAVE_THREADS_H = 0; then
-  AC_LIBOBJ([tss])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_TSS], [test $HAVE_THREADS_H = 0])
 gl_THREADS_MODULE_INDICATOR([tss])
 
 Makefile.am:
+if GL_COND_OBJ_TSS
+lib_SOURCES += tss.c
+endif
 
 Include:
 <threads.h>
diff --git a/modules/ttyname_r b/modules/ttyname_r
index 5e009268f8..6417d30395 100644
--- a/modules/ttyname_r
+++ b/modules/ttyname_r
@@ -11,13 +11,17 @@ extensions
 
 configure.ac:
 gl_FUNC_TTYNAME_R
-if test $HAVE_TTYNAME_R = 0 || test $REPLACE_TTYNAME_R = 1; then
-  AC_LIBOBJ([ttyname_r])
+gl_CONDITIONAL([GL_COND_OBJ_TTYNAME_R],
+               [test $HAVE_TTYNAME_R = 0 || test $REPLACE_TTYNAME_R = 1])
+AM_COND_IF([GL_COND_OBJ_TTYNAME_R], [
   gl_PREREQ_TTYNAME_R
-fi
+])
 gl_UNISTD_MODULE_INDICATOR([ttyname_r])
 
 Makefile.am:
+if GL_COND_OBJ_TTYNAME_R
+lib_SOURCES += ttyname_r.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/tzset b/modules/tzset
index 5423f3afe6..4997bf0992 100644
--- a/modules/tzset
+++ b/modules/tzset
@@ -10,12 +10,13 @@ time
 
 configure.ac:
 gl_FUNC_TZSET
-if test $REPLACE_TZSET = 1; then
-  AC_LIBOBJ([tzset])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_TZSET], [test $REPLACE_TZSET = 1])
 gl_TIME_MODULE_INDICATOR([tzset])
 
 Makefile.am:
+if GL_COND_OBJ_TZSET
+lib_SOURCES += tzset.c
+endif
 
 Include:
 <time.h>
diff --git a/modules/uname b/modules/uname
index 159254ec01..199bf34f24 100644
--- a/modules/uname
+++ b/modules/uname
@@ -11,13 +11,16 @@ gethostname     [test $HAVE_UNAME = 0]
 
 configure.ac:
 gl_FUNC_UNAME
-if test $HAVE_UNAME = 0; then
-  AC_LIBOBJ([uname])
+gl_CONDITIONAL([GL_COND_OBJ_UNAME], [test $HAVE_UNAME = 0])
+AM_COND_IF([GL_COND_OBJ_UNAME], [
   gl_PREREQ_UNAME
-fi
+])
 gl_SYS_UTSNAME_MODULE_INDICATOR([uname])
 
 Makefile.am:
+if GL_COND_OBJ_UNAME
+lib_SOURCES += uname.c
+endif
 
 Include:
 <sys/utsname.h>
diff --git a/modules/unlink b/modules/unlink
index 9e57184905..119ed9faed 100644
--- a/modules/unlink
+++ b/modules/unlink
@@ -13,12 +13,13 @@ malloc-posix    [test $REPLACE_UNLINK = 1]
 
 configure.ac:
 gl_FUNC_UNLINK
-if test $REPLACE_UNLINK = 1; then
-  AC_LIBOBJ([unlink])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_UNLINK], [test $REPLACE_UNLINK = 1])
 gl_UNISTD_MODULE_INDICATOR([unlink])
 
 Makefile.am:
+if GL_COND_OBJ_UNLINK
+lib_SOURCES += unlink.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/unlinkat b/modules/unlinkat
index b379a90354..0efc1cc1b2 100644
--- a/modules/unlinkat
+++ b/modules/unlinkat
@@ -25,12 +25,14 @@ unlink          [test $HAVE_UNLINKAT = 0]
 
 configure.ac:
 gl_FUNC_UNLINKAT
-if test $HAVE_UNLINKAT = 0 || test $REPLACE_UNLINKAT = 1; then
-  AC_LIBOBJ([unlinkat])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_UNLINKAT],
+               [test $HAVE_UNLINKAT = 0 || test $REPLACE_UNLINKAT = 1])
 gl_UNISTD_MODULE_INDICATOR([unlinkat])
 
 Makefile.am:
+if GL_COND_OBJ_UNLINKAT
+lib_SOURCES += unlinkat.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/unlockpt b/modules/unlockpt
index a0f4d2571f..d0c646f58e 100644
--- a/modules/unlockpt
+++ b/modules/unlockpt
@@ -14,13 +14,16 @@ ptsname         [test $HAVE_UNLOCKPT = 0]
 
 configure.ac:
 gl_FUNC_UNLOCKPT
-if test $HAVE_UNLOCKPT = 0; then
-  AC_LIBOBJ([unlockpt])
+gl_CONDITIONAL([GL_COND_OBJ_UNLOCKPT], [test $HAVE_UNLOCKPT = 0])
+AM_COND_IF([GL_COND_OBJ_UNLOCKPT], [
   gl_PREREQ_UNLOCKPT
-fi
+])
 gl_STDLIB_MODULE_INDICATOR([unlockpt])
 
 Makefile.am:
+if GL_COND_OBJ_UNLOCKPT
+lib_SOURCES += unlockpt.c
+endif
 
 Include:
 <stdlib.h>
diff --git a/modules/unsetenv b/modules/unsetenv
index 909cec97d2..0e603a5b76 100644
--- a/modules/unsetenv
+++ b/modules/unsetenv
@@ -12,13 +12,17 @@ environ         [test $HAVE_UNSETENV = 0 || test $REPLACE_UNSETENV = 1]
 
 configure.ac:
 gl_FUNC_UNSETENV
-if test $HAVE_UNSETENV = 0 || test $REPLACE_UNSETENV = 1; then
-  AC_LIBOBJ([unsetenv])
+gl_CONDITIONAL([GL_COND_OBJ_UNSETENV],
+               [test $HAVE_UNSETENV = 0 || test $REPLACE_UNSETENV = 1])
+AM_COND_IF([GL_COND_OBJ_UNSETENV], [
   gl_PREREQ_UNSETENV
-fi
+])
 gl_STDLIB_MODULE_INDICATOR([unsetenv])
 
 Makefile.am:
+if GL_COND_OBJ_UNSETENV
+lib_SOURCES += unsetenv.c
+endif
 
 Include:
 <stdlib.h>
diff --git a/modules/usleep b/modules/usleep
index 563df42316..1e842347fa 100644
--- a/modules/usleep
+++ b/modules/usleep
@@ -12,12 +12,14 @@ sleep           [test $HAVE_USLEEP = 0 || test $REPLACE_USLEEP = 1]
 
 configure.ac:
 gl_FUNC_USLEEP
-if test $HAVE_USLEEP = 0 || test $REPLACE_USLEEP = 1; then
-  AC_LIBOBJ([usleep])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_USLEEP],
+               [test $HAVE_USLEEP = 0 || test $REPLACE_USLEEP = 1])
 gl_UNISTD_MODULE_INDICATOR([usleep])
 
 Makefile.am:
+if GL_COND_OBJ_USLEEP
+lib_SOURCES += usleep.c
+endif
 
 Include:
 <unistd.h>
diff --git a/modules/utime b/modules/utime
index d1975f47b3..f09e57346d 100644
--- a/modules/utime
+++ b/modules/utime
@@ -14,13 +14,17 @@ stat            [test $HAVE_UTIME = 0 || test $REPLACE_UTIME = 1]
 
 configure.ac:
 gl_FUNC_UTIME
-if test $HAVE_UTIME = 0 || test $REPLACE_UTIME = 1; then
-  AC_LIBOBJ([utime])
+gl_CONDITIONAL([GL_COND_OBJ_UTIME],
+               [test $HAVE_UTIME = 0 || test $REPLACE_UTIME = 1])
+AM_COND_IF([GL_COND_OBJ_UTIME], [
   gl_PREREQ_UTIME
-fi
+])
 gl_UTIME_MODULE_INDICATOR([utime])
 
 Makefile.am:
+if GL_COND_OBJ_UTIME
+lib_SOURCES += utime.c
+endif
 
 Include:
 <utime.h>
diff --git a/modules/utimensat b/modules/utimensat
index 1d8895f9f8..8f9e0aa6c1 100644
--- a/modules/utimensat
+++ b/modules/utimensat
@@ -23,12 +23,14 @@ fstatat         [test $REPLACE_UTIMENSAT = 1]
 
 configure.ac:
 gl_FUNC_UTIMENSAT
-if test $HAVE_UTIMENSAT = 0 || test $REPLACE_UTIMENSAT = 1; then
-  AC_LIBOBJ([utimensat])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_UTIMENSAT],
+               [test $HAVE_UTIMENSAT = 0 || test $REPLACE_UTIMENSAT = 1])
 gl_SYS_STAT_MODULE_INDICATOR([utimensat])
 
 Makefile.am:
+if GL_COND_OBJ_UTIMENSAT
+lib_SOURCES += utimensat.c
+endif
 
 Include:
 <sys/stat.h>
diff --git a/modules/waitpid b/modules/waitpid
index db34e27f39..52a7a9bda8 100644
--- a/modules/waitpid
+++ b/modules/waitpid
@@ -10,12 +10,13 @@ sys_wait
 
 configure.ac:
 gl_FUNC_WAITPID
-if test $HAVE_WAITPID = 0; then
-  AC_LIBOBJ([waitpid])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_WAITPID], [test $HAVE_WAITPID = 0])
 gl_SYS_WAIT_MODULE_INDICATOR([waitpid])
 
 Makefile.am:
+if GL_COND_OBJ_WAITPID
+lib_SOURCES += waitpid.c
+endif
 
 Include:
 <sys/wait.h>
diff --git a/modules/wcpcpy b/modules/wcpcpy
index 378f70e607..65bd6e94c2 100644
--- a/modules/wcpcpy
+++ b/modules/wcpcpy
@@ -18,12 +18,13 @@ wchar
 
 configure.ac:
 gl_FUNC_WCPCPY
-if test $HAVE_WCPCPY = 0; then
-  AC_LIBOBJ([wcpcpy])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_WCPCPY], [test $HAVE_WCPCPY = 0])
 gl_WCHAR_MODULE_INDICATOR([wcpcpy])
 
 Makefile.am:
+if GL_COND_OBJ_WCPCPY
+lib_SOURCES += wcpcpy.c
+endif
 
 Include:
 <wchar.h>
diff --git a/modules/wcpncpy b/modules/wcpncpy
index f259fb42ea..04e90071ea 100644
--- a/modules/wcpncpy
+++ b/modules/wcpncpy
@@ -12,12 +12,13 @@ wchar
 
 configure.ac:
 gl_FUNC_WCPNCPY
-if test $HAVE_WCPNCPY = 0; then
-  AC_LIBOBJ([wcpncpy])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_WCPNCPY], [test $HAVE_WCPNCPY = 0])
 gl_WCHAR_MODULE_INDICATOR([wcpncpy])
 
 Makefile.am:
+if GL_COND_OBJ_WCPNCPY
+lib_SOURCES += wcpncpy.c
+endif
 
 Include:
 <wchar.h>
diff --git a/modules/wcrtomb b/modules/wcrtomb
index f0aebecca4..b287614318 100644
--- a/modules/wcrtomb
+++ b/modules/wcrtomb
@@ -18,13 +18,17 @@ mbsinit         [test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1]
 
 configure.ac:
 gl_FUNC_WCRTOMB
-if test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1; then
-  AC_LIBOBJ([wcrtomb])
+gl_CONDITIONAL([GL_COND_OBJ_WCRTOMB],
+               [test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1])
+AM_COND_IF([GL_COND_OBJ_WCRTOMB], [
   gl_PREREQ_WCRTOMB
-fi
+])
 gl_WCHAR_MODULE_INDICATOR([wcrtomb])
 
 Makefile.am:
+if GL_COND_OBJ_WCRTOMB
+lib_SOURCES += wcrtomb.c
+endif
 
 Include:
 <wchar.h>
diff --git a/modules/wcscasecmp b/modules/wcscasecmp
index 811d99f6a4..2799816ad0 100644
--- a/modules/wcscasecmp
+++ b/modules/wcscasecmp
@@ -12,12 +12,13 @@ wctype-h        [test $HAVE_WCSCASECMP = 0]
 
 configure.ac:
 gl_FUNC_WCSCASECMP
-if test $HAVE_WCSCASECMP = 0; then
-  AC_LIBOBJ([wcscasecmp])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_WCSCASECMP], [test $HAVE_WCSCASECMP = 0])
 gl_WCHAR_MODULE_INDICATOR([wcscasecmp])
 
 Makefile.am:
+if GL_COND_OBJ_WCSCASECMP
+lib_SOURCES += wcscasecmp.c
+endif
 
 Include:
 <wchar.h>
diff --git a/modules/wcscat b/modules/wcscat
index eb895b42e3..80c74e2273 100644
--- a/modules/wcscat
+++ b/modules/wcscat
@@ -17,12 +17,13 @@ wchar
 
 configure.ac:
 gl_FUNC_WCSCAT
-if test $HAVE_WCSCAT = 0; then
-  AC_LIBOBJ([wcscat])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_WCSCAT], [test $HAVE_WCSCAT = 0])
 gl_WCHAR_MODULE_INDICATOR([wcscat])
 
 Makefile.am:
+if GL_COND_OBJ_WCSCAT
+lib_SOURCES += wcscat.c
+endif
 
 Include:
 <wchar.h>
diff --git a/modules/wcschr b/modules/wcschr
index 9a2c457384..a5c40efffb 100644
--- a/modules/wcschr
+++ b/modules/wcschr
@@ -17,12 +17,13 @@ wchar
 
 configure.ac:
 gl_FUNC_WCSCHR
-if test $HAVE_WCSCHR = 0; then
-  AC_LIBOBJ([wcschr])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_WCSCHR], [test $HAVE_WCSCHR = 0])
 gl_WCHAR_MODULE_INDICATOR([wcschr])
 
 Makefile.am:
+if GL_COND_OBJ_WCSCHR
+lib_SOURCES += wcschr.c
+endif
 
 Include:
 <wchar.h>
diff --git a/modules/wcscmp b/modules/wcscmp
index 6591511485..1b4fde704a 100644
--- a/modules/wcscmp
+++ b/modules/wcscmp
@@ -17,12 +17,13 @@ wchar
 
 configure.ac:
 gl_FUNC_WCSCMP
-if test $HAVE_WCSCMP = 0; then
-  AC_LIBOBJ([wcscmp])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_WCSCMP], [test $HAVE_WCSCMP = 0])
 gl_WCHAR_MODULE_INDICATOR([wcscmp])
 
 Makefile.am:
+if GL_COND_OBJ_WCSCMP
+lib_SOURCES += wcscmp.c
+endif
 
 Include:
 <wchar.h>
diff --git a/modules/wcscoll b/modules/wcscoll
index c15d7d5cf8..5a6ffa3267 100644
--- a/modules/wcscoll
+++ b/modules/wcscoll
@@ -18,12 +18,13 @@ wchar
 
 configure.ac:
 gl_FUNC_WCSCOLL
-if test $HAVE_WCSCOLL = 0; then
-  AC_LIBOBJ([wcscoll])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_WCSCOLL], [test $HAVE_WCSCOLL = 0])
 gl_WCHAR_MODULE_INDICATOR([wcscoll])
 
 Makefile.am:
+if GL_COND_OBJ_WCSCOLL
+lib_SOURCES += wcscoll.c
+endif
 
 Include:
 <wchar.h>
diff --git a/modules/wcscpy b/modules/wcscpy
index d9436430f0..e37462fcd7 100644
--- a/modules/wcscpy
+++ b/modules/wcscpy
@@ -17,12 +17,13 @@ wchar
 
 configure.ac:
 gl_FUNC_WCSCPY
-if test $HAVE_WCSCPY = 0; then
-  AC_LIBOBJ([wcscpy])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_WCSCPY], [test $HAVE_WCSCPY = 0])
 gl_WCHAR_MODULE_INDICATOR([wcscpy])
 
 Makefile.am:
+if GL_COND_OBJ_WCSCPY
+lib_SOURCES += wcscpy.c
+endif
 
 Include:
 <wchar.h>
diff --git a/modules/wcscspn b/modules/wcscspn
index 88d44b4f72..844b5f9cf3 100644
--- a/modules/wcscspn
+++ b/modules/wcscspn
@@ -19,12 +19,13 @@ wcschr          [test $HAVE_WCSCSPN = 0]
 
 configure.ac:
 gl_FUNC_WCSCSPN
-if test $HAVE_WCSCSPN = 0; then
-  AC_LIBOBJ([wcscspn])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_WCSCSPN], [test $HAVE_WCSCSPN = 0])
 gl_WCHAR_MODULE_INDICATOR([wcscspn])
 
 Makefile.am:
+if GL_COND_OBJ_WCSCSPN
+lib_SOURCES += wcscspn.c
+endif
 
 Include:
 <wchar.h>
diff --git a/modules/wcsdup b/modules/wcsdup
index 1f08169081..59a53c370c 100644
--- a/modules/wcsdup
+++ b/modules/wcsdup
@@ -13,12 +13,13 @@ wmemcpy         [test $HAVE_WCSDUP = 0]
 
 configure.ac:
 gl_FUNC_WCSDUP
-if test $HAVE_WCSDUP = 0; then
-  AC_LIBOBJ([wcsdup])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_WCSDUP], [test $HAVE_WCSDUP = 0])
 gl_WCHAR_MODULE_INDICATOR([wcsdup])
 
 Makefile.am:
+if GL_COND_OBJ_WCSDUP
+lib_SOURCES += wcsdup.c
+endif
 
 Include:
 <wchar.h>
diff --git a/modules/wcsftime b/modules/wcsftime
index d911a28897..5da3efb03e 100644
--- a/modules/wcsftime
+++ b/modules/wcsftime
@@ -10,12 +10,13 @@ wchar
 
 configure.ac:
 gl_FUNC_WCSFTIME
-if test $REPLACE_WCSFTIME = 1; then
-  AC_LIBOBJ([wcsftime])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_WCSFTIME], [test $REPLACE_WCSFTIME = 1])
 gl_WCHAR_MODULE_INDICATOR([wcsftime])
 
 Makefile.am:
+if GL_COND_OBJ_WCSFTIME
+lib_SOURCES += wcsftime.c
+endif
 
 Include:
 <wchar.h>
diff --git a/modules/wcslen b/modules/wcslen
index 01133bb193..fea4ba4ed7 100644
--- a/modules/wcslen
+++ b/modules/wcslen
@@ -17,12 +17,13 @@ wchar
 
 configure.ac:
 gl_FUNC_WCSLEN
-if test $HAVE_WCSLEN = 0; then
-  AC_LIBOBJ([wcslen])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_WCSLEN], [test $HAVE_WCSLEN = 0])
 gl_WCHAR_MODULE_INDICATOR([wcslen])
 
 Makefile.am:
+if GL_COND_OBJ_WCSLEN
+lib_SOURCES += wcslen.c
+endif
 
 Include:
 <wchar.h>
diff --git a/modules/wcsncasecmp b/modules/wcsncasecmp
index a0cbe9a8a8..a3453b654e 100644
--- a/modules/wcsncasecmp
+++ b/modules/wcsncasecmp
@@ -12,12 +12,13 @@ wctype-h        [test $HAVE_WCSNCASECMP = 0]
 
 configure.ac:
 gl_FUNC_WCSNCASECMP
-if test $HAVE_WCSNCASECMP = 0; then
-  AC_LIBOBJ([wcsncasecmp])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_WCSNCASECMP], [test $HAVE_WCSNCASECMP = 0])
 gl_WCHAR_MODULE_INDICATOR([wcsncasecmp])
 
 Makefile.am:
+if GL_COND_OBJ_WCSNCASECMP
+lib_SOURCES += wcsncasecmp.c
+endif
 
 Include:
 <wchar.h>
diff --git a/modules/wcsncat b/modules/wcsncat
index afbf3190d0..354e317616 100644
--- a/modules/wcsncat
+++ b/modules/wcsncat
@@ -17,12 +17,13 @@ wchar
 
 configure.ac:
 gl_FUNC_WCSNCAT
-if test $HAVE_WCSNCAT = 0; then
-  AC_LIBOBJ([wcsncat])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_WCSNCAT], [test $HAVE_WCSNCAT = 0])
 gl_WCHAR_MODULE_INDICATOR([wcsncat])
 
 Makefile.am:
+if GL_COND_OBJ_WCSNCAT
+lib_SOURCES += wcsncat.c
+endif
 
 Include:
 <wchar.h>
diff --git a/modules/wcsncmp b/modules/wcsncmp
index 296c5900df..a09ab92bfd 100644
--- a/modules/wcsncmp
+++ b/modules/wcsncmp
@@ -17,12 +17,13 @@ wchar
 
 configure.ac:
 gl_FUNC_WCSNCMP
-if test $HAVE_WCSNCMP = 0; then
-  AC_LIBOBJ([wcsncmp])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_WCSNCMP], [test $HAVE_WCSNCMP = 0])
 gl_WCHAR_MODULE_INDICATOR([wcsncmp])
 
 Makefile.am:
+if GL_COND_OBJ_WCSNCMP
+lib_SOURCES += wcsncmp.c
+endif
 
 Include:
 <wchar.h>
diff --git a/modules/wcsncpy b/modules/wcsncpy
index 70520eaf8c..e8a165e6df 100644
--- a/modules/wcsncpy
+++ b/modules/wcsncpy
@@ -17,12 +17,13 @@ wchar
 
 configure.ac:
 gl_FUNC_WCSNCPY
-if test $HAVE_WCSNCPY = 0; then
-  AC_LIBOBJ([wcsncpy])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_WCSNCPY], [test $HAVE_WCSNCPY = 0])
 gl_WCHAR_MODULE_INDICATOR([wcsncpy])
 
 Makefile.am:
+if GL_COND_OBJ_WCSNCPY
+lib_SOURCES += wcsncpy.c
+endif
 
 Include:
 <wchar.h>
diff --git a/modules/wcsnlen b/modules/wcsnlen
index d27b65469b..dba67d644d 100644
--- a/modules/wcsnlen
+++ b/modules/wcsnlen
@@ -11,12 +11,13 @@ wchar
 
 configure.ac:
 gl_FUNC_WCSNLEN
-if test $HAVE_WCSNLEN = 0; then
-  AC_LIBOBJ([wcsnlen])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_WCSNLEN], [test $HAVE_WCSNLEN = 0])
 gl_WCHAR_MODULE_INDICATOR([wcsnlen])
 
 Makefile.am:
+if GL_COND_OBJ_WCSNLEN
+lib_SOURCES += wcsnlen.c
+endif
 
 Include:
 <wchar.h>
diff --git a/modules/wcsnrtombs b/modules/wcsnrtombs
index b77058091a..736e279c22 100644
--- a/modules/wcsnrtombs
+++ b/modules/wcsnrtombs
@@ -19,14 +19,18 @@ wcrtomb         [test $HAVE_WCSNRTOMBS = 0 || test $REPLACE_WCSNRTOMBS = 1]
 
 configure.ac:
 gl_FUNC_WCSNRTOMBS
-if test $HAVE_WCSNRTOMBS = 0 || test $REPLACE_WCSNRTOMBS = 1; then
-  AC_LIBOBJ([wcsnrtombs])
+gl_CONDITIONAL([GL_COND_OBJ_WCSNRTOMBS],
+               [test $HAVE_WCSNRTOMBS = 0 || test $REPLACE_WCSNRTOMBS = 1])
+AM_COND_IF([GL_COND_OBJ_WCSNRTOMBS], [
   AC_LIBOBJ([wcsrtombs-state])
   gl_PREREQ_WCSNRTOMBS
-fi
+])
 gl_WCHAR_MODULE_INDICATOR([wcsnrtombs])
 
 Makefile.am:
+if GL_COND_OBJ_WCSNRTOMBS
+lib_SOURCES += wcsnrtombs.c
+endif
 
 Include:
 <wchar.h>
diff --git a/modules/wcspbrk b/modules/wcspbrk
index 514898aebb..e42958803e 100644
--- a/modules/wcspbrk
+++ b/modules/wcspbrk
@@ -18,12 +18,13 @@ wcschr          [test $HAVE_WCSPBRK = 0]
 
 configure.ac:
 gl_FUNC_WCSPBRK
-if test $HAVE_WCSPBRK = 0; then
-  AC_LIBOBJ([wcspbrk])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_WCSPBRK], [test $HAVE_WCSPBRK = 0])
 gl_WCHAR_MODULE_INDICATOR([wcspbrk])
 
 Makefile.am:
+if GL_COND_OBJ_WCSPBRK
+lib_SOURCES += wcspbrk.c
+endif
 
 Include:
 <wchar.h>
diff --git a/modules/wcsrchr b/modules/wcsrchr
index 73deb7b7d5..681af3f1a5 100644
--- a/modules/wcsrchr
+++ b/modules/wcsrchr
@@ -17,12 +17,13 @@ wchar
 
 configure.ac:
 gl_FUNC_WCSRCHR
-if test $HAVE_WCSRCHR = 0; then
-  AC_LIBOBJ([wcsrchr])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_WCSRCHR], [test $HAVE_WCSRCHR = 0])
 gl_WCHAR_MODULE_INDICATOR([wcsrchr])
 
 Makefile.am:
+if GL_COND_OBJ_WCSRCHR
+lib_SOURCES += wcsrchr.c
+endif
 
 Include:
 <wchar.h>
diff --git a/modules/wcsrtombs b/modules/wcsrtombs
index 8afcdad9d2..127be1df77 100644
--- a/modules/wcsrtombs
+++ b/modules/wcsrtombs
@@ -20,14 +20,18 @@ wcrtomb         [test $HAVE_WCSRTOMBS = 0 || test $REPLACE_WCSRTOMBS = 1]
 
 configure.ac:
 gl_FUNC_WCSRTOMBS
-if test $HAVE_WCSRTOMBS = 0 || test $REPLACE_WCSRTOMBS = 1; then
-  AC_LIBOBJ([wcsrtombs])
+gl_CONDITIONAL([GL_COND_OBJ_WCSRTOMBS],
+               [test $HAVE_WCSRTOMBS = 0 || test $REPLACE_WCSRTOMBS = 1])
+AM_COND_IF([GL_COND_OBJ_WCSRTOMBS], [
   AC_LIBOBJ([wcsrtombs-state])
   gl_PREREQ_WCSRTOMBS
-fi
+])
 gl_WCHAR_MODULE_INDICATOR([wcsrtombs])
 
 Makefile.am:
+if GL_COND_OBJ_WCSRTOMBS
+lib_SOURCES += wcsrtombs.c
+endif
 
 Include:
 <wchar.h>
diff --git a/modules/wcsspn b/modules/wcsspn
index 0bfe51c7cc..684c2676c3 100644
--- a/modules/wcsspn
+++ b/modules/wcsspn
@@ -18,12 +18,13 @@ wcschr          [test $HAVE_WCSSPN = 0]
 
 configure.ac:
 gl_FUNC_WCSSPN
-if test $HAVE_WCSSPN = 0; then
-  AC_LIBOBJ([wcsspn])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_WCSSPN], [test $HAVE_WCSSPN = 0])
 gl_WCHAR_MODULE_INDICATOR([wcsspn])
 
 Makefile.am:
+if GL_COND_OBJ_WCSSPN
+lib_SOURCES += wcsspn.c
+endif
 
 Include:
 <wchar.h>
diff --git a/modules/wcsstr b/modules/wcsstr
index f976392e0a..e2362d8d2b 100644
--- a/modules/wcsstr
+++ b/modules/wcsstr
@@ -12,12 +12,13 @@ wcschr          [test $HAVE_WCSSTR = 0]
 
 configure.ac:
 gl_FUNC_WCSSTR
-if test $HAVE_WCSSTR = 0; then
-  AC_LIBOBJ([wcsstr])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_WCSSTR], [test $HAVE_WCSSTR = 0])
 gl_WCHAR_MODULE_INDICATOR([wcsstr])
 
 Makefile.am:
+if GL_COND_OBJ_WCSSTR
+lib_SOURCES += wcsstr.c
+endif
 
 Include:
 <wchar.h>
diff --git a/modules/wcstok b/modules/wcstok
index 6f7e62c8ba..19593faccb 100644
--- a/modules/wcstok
+++ b/modules/wcstok
@@ -13,12 +13,14 @@ wcspbrk         [test $HAVE_WCSTOK = 0 || test $REPLACE_WCSTOK = 1]
 
 configure.ac:
 gl_FUNC_WCSTOK
-if test $HAVE_WCSTOK = 0 || test $REPLACE_WCSTOK = 1; then
-  AC_LIBOBJ([wcstok])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_WCSTOK],
+               [test $HAVE_WCSTOK = 0 || test $REPLACE_WCSTOK = 1])
 gl_WCHAR_MODULE_INDICATOR([wcstok])
 
 Makefile.am:
+if GL_COND_OBJ_WCSTOK
+lib_SOURCES += wcstok.c
+endif
 
 Include:
 <wchar.h>
diff --git a/modules/wcswidth b/modules/wcswidth
index 022834b279..1165d7a5c4 100644
--- a/modules/wcswidth
+++ b/modules/wcswidth
@@ -13,12 +13,14 @@ wcwidth         [test $HAVE_WCSWIDTH = 0 || test $REPLACE_WCSWIDTH = 1]
 
 configure.ac:
 gl_FUNC_WCSWIDTH
-if test $HAVE_WCSWIDTH = 0 || test $REPLACE_WCSWIDTH = 1; then
-  AC_LIBOBJ([wcswidth])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_WCSWIDTH],
+               [test $HAVE_WCSWIDTH = 0 || test $REPLACE_WCSWIDTH = 1])
 gl_WCHAR_MODULE_INDICATOR([wcswidth])
 
 Makefile.am:
+if GL_COND_OBJ_WCSWIDTH
+lib_SOURCES += wcswidth.c
+endif
 
 Include:
 <wchar.h>
diff --git a/modules/wcsxfrm b/modules/wcsxfrm
index 2ac45848e9..ff8c8f04ca 100644
--- a/modules/wcsxfrm
+++ b/modules/wcsxfrm
@@ -13,12 +13,13 @@ wchar
 
 configure.ac:
 gl_FUNC_WCSXFRM
-if test $HAVE_WCSXFRM = 0; then
-  AC_LIBOBJ([wcsxfrm])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_WCSXFRM], [test $HAVE_WCSXFRM = 0])
 gl_WCHAR_MODULE_INDICATOR([wcsxfrm])
 
 Makefile.am:
+if GL_COND_OBJ_WCSXFRM
+lib_SOURCES += wcsxfrm.c
+endif
 
 Include:
 <wchar.h>
diff --git a/modules/wctob b/modules/wctob
index cf917be0f6..b2b96965db 100644
--- a/modules/wctob
+++ b/modules/wctob
@@ -13,13 +13,17 @@ wctomb          [test $HAVE_WCTOB = 0 || test $REPLACE_WCTOB = 1]
 
 configure.ac:
 gl_FUNC_WCTOB
-if test $HAVE_WCTOB = 0 || test $REPLACE_WCTOB = 1; then
-  AC_LIBOBJ([wctob])
+gl_CONDITIONAL([GL_COND_OBJ_WCTOB],
+               [test $HAVE_WCTOB = 0 || test $REPLACE_WCTOB = 1])
+AM_COND_IF([GL_COND_OBJ_WCTOB], [
   gl_PREREQ_WCTOB
-fi
+])
 gl_WCHAR_MODULE_INDICATOR([wctob])
 
 Makefile.am:
+if GL_COND_OBJ_WCTOB
+lib_SOURCES += wctob.c
+endif
 
 Include:
 <wchar.h>
diff --git a/modules/wctomb b/modules/wctomb
index 9e318701e7..dec45af5c7 100644
--- a/modules/wctomb
+++ b/modules/wctomb
@@ -13,13 +13,16 @@ wchar           [test $REPLACE_WCTOMB = 1]
 
 configure.ac:
 gl_FUNC_WCTOMB
-if test $REPLACE_WCTOMB = 1; then
-  AC_LIBOBJ([wctomb])
+gl_CONDITIONAL([GL_COND_OBJ_WCTOMB], [test $REPLACE_WCTOMB = 1])
+AM_COND_IF([GL_COND_OBJ_WCTOMB], [
   gl_PREREQ_WCTOMB
-fi
+])
 gl_STDLIB_MODULE_INDICATOR([wctomb])
 
 Makefile.am:
+if GL_COND_OBJ_WCTOMB
+lib_SOURCES += wctomb.c
+endif
 
 Include:
 <stdlib.h>
diff --git a/modules/wctrans b/modules/wctrans
index 05db912b23..5b7e57ae2b 100644
--- a/modules/wctrans
+++ b/modules/wctrans
@@ -11,12 +11,13 @@ wctype-h
 
 configure.ac:
 gl_FUNC_WCTRANS
-if test $HAVE_WCTRANS = 0; then
-  AC_LIBOBJ([wctrans])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_WCTRANS], [test $HAVE_WCTRANS = 0])
 gl_WCTYPE_MODULE_INDICATOR([wctrans])
 
 Makefile.am:
+if GL_COND_OBJ_WCTRANS
+lib_SOURCES += wctrans.c
+endif
 
 Include:
 <wctype.h>
diff --git a/modules/wctype b/modules/wctype
index e653f62748..6a8d03b6ee 100644
--- a/modules/wctype
+++ b/modules/wctype
@@ -20,12 +20,13 @@ iswxdigit       [test $HAVE_WCTYPE = 0]
 
 configure.ac:
 gl_FUNC_WCTYPE
-if test $HAVE_WCTYPE = 0; then
-  AC_LIBOBJ([wctype])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_WCTYPE], [test $HAVE_WCTYPE = 0])
 gl_WCTYPE_MODULE_INDICATOR([wctype])
 
 Makefile.am:
+if GL_COND_OBJ_WCTYPE
+lib_SOURCES += wctype.c
+endif
 
 Include:
 <wctype.h>
diff --git a/modules/wcwidth b/modules/wcwidth
index 2a74415457..6738b644cc 100644
--- a/modules/wcwidth
+++ b/modules/wcwidth
@@ -17,13 +17,17 @@ uniwidth/width  [test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1]
 
 configure.ac:
 gl_FUNC_WCWIDTH
-if test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1; then
-  AC_LIBOBJ([wcwidth])
+gl_CONDITIONAL([GL_COND_OBJ_WCWIDTH],
+               [test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1])
+AM_COND_IF([GL_COND_OBJ_WCWIDTH], [
   gl_PREREQ_WCWIDTH
-fi
+])
 gl_WCHAR_MODULE_INDICATOR([wcwidth])
 
 Makefile.am:
+if GL_COND_OBJ_WCWIDTH
+lib_SOURCES += wcwidth.c
+endif
 
 Include:
 <wchar.h>
diff --git a/modules/windows-cond b/modules/windows-cond
index 306d7add2c..b370bf989a 100644
--- a/modules/windows-cond
+++ b/modules/windows-cond
@@ -14,13 +14,13 @@ gettimeofday
 
 configure.ac:
 AC_REQUIRE([AC_CANONICAL_HOST])
-case "$host_os" in
-  mingw*)
-    AC_LIBOBJ([windows-cond])
-    ;;
-esac
+gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_COND],
+               [case "$host_os" in mingw*) true;; *) false;; esac])
 
 Makefile.am:
+if GL_COND_OBJ_WINDOWS_COND
+lib_SOURCES += windows-cond.c
+endif
 
 Include:
 "windows-cond.h"
diff --git a/modules/windows-mutex b/modules/windows-mutex
index 2083ce0812..67e54c1b8d 100644
--- a/modules/windows-mutex
+++ b/modules/windows-mutex
@@ -10,13 +10,13 @@ Depends-on:
 
 configure.ac:
 AC_REQUIRE([AC_CANONICAL_HOST])
-case "$host_os" in
-  mingw*)
-    AC_LIBOBJ([windows-mutex])
-    ;;
-esac
+gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_MUTEX],
+               [case "$host_os" in mingw*) true;; *) false;; esac])
 
 Makefile.am:
+if GL_COND_OBJ_WINDOWS_MUTEX
+lib_SOURCES += windows-mutex.c
+endif
 
 Include:
 "windows-mutex.h"
diff --git a/modules/windows-once b/modules/windows-once
index 34d5b1e3bd..b41cfacbe0 100644
--- a/modules/windows-once
+++ b/modules/windows-once
@@ -9,13 +9,13 @@ Depends-on:
 
 configure.ac:
 AC_REQUIRE([AC_CANONICAL_HOST])
-case "$host_os" in
-  mingw*)
-    AC_LIBOBJ([windows-once])
-    ;;
-esac
+gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_ONCE],
+               [case "$host_os" in mingw*) true;; *) false;; esac])
 
 Makefile.am:
+if GL_COND_OBJ_WINDOWS_ONCE
+lib_SOURCES += windows-once.c
+endif
 
 Include:
 "windows-once.h"
diff --git a/modules/windows-recmutex b/modules/windows-recmutex
index 914c40e2ae..e1d858a327 100644
--- a/modules/windows-recmutex
+++ b/modules/windows-recmutex
@@ -10,13 +10,13 @@ Depends-on:
 
 configure.ac:
 AC_REQUIRE([AC_CANONICAL_HOST])
-case "$host_os" in
-  mingw*)
-    AC_LIBOBJ([windows-recmutex])
-    ;;
-esac
+gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_RECMUTEX],
+               [case "$host_os" in mingw*) true;; *) false;; esac])
 
 Makefile.am:
+if GL_COND_OBJ_WINDOWS_RECMUTEX
+lib_SOURCES += windows-recmutex.c
+endif
 
 Include:
 "windows-recmutex.h"
diff --git a/modules/windows-rwlock b/modules/windows-rwlock
index 665d60245e..28cc3b93dc 100644
--- a/modules/windows-rwlock
+++ b/modules/windows-rwlock
@@ -10,13 +10,13 @@ Depends-on:
 
 configure.ac:
 AC_REQUIRE([AC_CANONICAL_HOST])
-case "$host_os" in
-  mingw*)
-    AC_LIBOBJ([windows-rwlock])
-    ;;
-esac
+gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_RWLOCK],
+               [case "$host_os" in mingw*) true;; *) false;; esac])
 
 Makefile.am:
+if GL_COND_OBJ_WINDOWS_RWLOCK
+lib_SOURCES += windows-rwlock.c
+endif
 
 Include:
 "windows-rwlock.h"
diff --git a/modules/windows-spawn b/modules/windows-spawn
index 2843921cd9..d9415fcb87 100644
--- a/modules/windows-spawn
+++ b/modules/windows-spawn
@@ -17,13 +17,13 @@ malloc-posix
 
 configure.ac:
 AC_REQUIRE([AC_CANONICAL_HOST])
-case "$host_os" in
-  mingw*)
-    AC_LIBOBJ([windows-spawn])
-    ;;
-esac
+gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_SPAWN],
+               [case "$host_os" in mingw*) true;; *) false;; esac])
 
 Makefile.am:
+if GL_COND_OBJ_WINDOWS_SPAWN
+lib_SOURCES += windows-spawn.c
+endif
 
 Include:
 "windows-spawn.h"
diff --git a/modules/windows-spin b/modules/windows-spin
index 687385ab82..ef7f994020 100644
--- a/modules/windows-spin
+++ b/modules/windows-spin
@@ -9,13 +9,13 @@ Depends-on:
 
 configure.ac:
 AC_REQUIRE([AC_CANONICAL_HOST])
-case "$host_os" in
-  mingw*)
-    AC_LIBOBJ([windows-spin])
-    ;;
-esac
+gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_SPIN],
+               [case "$host_os" in mingw*) true;; *) false;; esac])
 
 Makefile.am:
+if GL_COND_OBJ_WINDOWS_SPIN
+lib_SOURCES += windows-spin.c
+endif
 
 Include:
 "windows-spin.h"
diff --git a/modules/windows-thread b/modules/windows-thread
index 3c1b7ac042..b036c2c4a9 100644
--- a/modules/windows-thread
+++ b/modules/windows-thread
@@ -11,13 +11,13 @@ windows-tls
 
 configure.ac:
 AC_REQUIRE([AC_CANONICAL_HOST])
-case "$host_os" in
-  mingw*)
-    AC_LIBOBJ([windows-thread])
-    ;;
-esac
+gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_THREAD],
+               [case "$host_os" in mingw*) true;; *) false;; esac])
 
 Makefile.am:
+if GL_COND_OBJ_WINDOWS_THREAD
+lib_SOURCES += windows-thread.c
+endif
 
 Include:
 "windows-thread.h"
diff --git a/modules/windows-timedmutex b/modules/windows-timedmutex
index b7570643a4..6c3868c498 100644
--- a/modules/windows-timedmutex
+++ b/modules/windows-timedmutex
@@ -13,13 +13,13 @@ gettimeofday
 
 configure.ac:
 AC_REQUIRE([AC_CANONICAL_HOST])
-case "$host_os" in
-  mingw*)
-    AC_LIBOBJ([windows-timedmutex])
-    ;;
-esac
+gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_TIMEDMUTEX],
+               [case "$host_os" in mingw*) true;; *) false;; esac])
 
 Makefile.am:
+if GL_COND_OBJ_WINDOWS_TIMEDMUTEX
+lib_SOURCES += windows-timedmutex.c
+endif
 
 Include:
 "windows-timedmutex.h"
diff --git a/modules/windows-timedrecmutex b/modules/windows-timedrecmutex
index 7d57310f38..b17113457f 100644
--- a/modules/windows-timedrecmutex
+++ b/modules/windows-timedrecmutex
@@ -13,13 +13,13 @@ gettimeofday
 
 configure.ac:
 AC_REQUIRE([AC_CANONICAL_HOST])
-case "$host_os" in
-  mingw*)
-    AC_LIBOBJ([windows-timedrecmutex])
-    ;;
-esac
+gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_TIMEDRECMUTEX],
+               [case "$host_os" in mingw*) true;; *) false;; esac])
 
 Makefile.am:
+if GL_COND_OBJ_WINDOWS_TIMEDRECMUTEX
+lib_SOURCES += windows-timedrecmutex.c
+endif
 
 Include:
 "windows-timedrecmutex.h"
diff --git a/modules/windows-timedrwlock b/modules/windows-timedrwlock
index 63266fbd01..f9469b159d 100644
--- a/modules/windows-timedrwlock
+++ b/modules/windows-timedrwlock
@@ -13,13 +13,13 @@ gettimeofday
 
 configure.ac:
 AC_REQUIRE([AC_CANONICAL_HOST])
-case "$host_os" in
-  mingw*)
-    AC_LIBOBJ([windows-timedrwlock])
-    ;;
-esac
+gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_TIMEDRWLOCK],
+               [case "$host_os" in mingw*) true;; *) false;; esac])
 
 Makefile.am:
+if GL_COND_OBJ_WINDOWS_TIMEDRWLOCK
+lib_SOURCES += windows-timedrwlock.c
+endif
 
 Include:
 "windows-timedrwlock.h"
diff --git a/modules/windows-tls b/modules/windows-tls
index 301d7c3d75..2e229940cc 100644
--- a/modules/windows-tls
+++ b/modules/windows-tls
@@ -10,13 +10,13 @@ windows-once
 
 configure.ac:
 AC_REQUIRE([AC_CANONICAL_HOST])
-case "$host_os" in
-  mingw*)
-    AC_LIBOBJ([windows-tls])
-    ;;
-esac
+gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_TLS],
+               [case "$host_os" in mingw*) true;; *) false;; esac])
 
 Makefile.am:
+if GL_COND_OBJ_WINDOWS_TLS
+lib_SOURCES += windows-tls.c
+endif
 
 Include:
 "windows-tls.h"
diff --git a/modules/wmemchr b/modules/wmemchr
index 89bc3d19c0..2e1e1337db 100644
--- a/modules/wmemchr
+++ b/modules/wmemchr
@@ -11,12 +11,13 @@ wchar
 
 configure.ac:
 gl_FUNC_WMEMCHR
-if test $HAVE_WMEMCHR = 0; then
-  AC_LIBOBJ([wmemchr])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_WMEMCHR], [test $HAVE_WMEMCHR = 0])
 gl_WCHAR_MODULE_INDICATOR([wmemchr])
 
 Makefile.am:
+if GL_COND_OBJ_WMEMCHR
+lib_SOURCES += wmemchr.c
+endif
 
 Include:
 <wchar.h>
diff --git a/modules/wmemcmp b/modules/wmemcmp
index fa43e5757f..219f3c3754 100644
--- a/modules/wmemcmp
+++ b/modules/wmemcmp
@@ -11,12 +11,13 @@ wchar
 
 configure.ac:
 gl_FUNC_WMEMCMP
-if test $HAVE_WMEMCMP = 0; then
-  AC_LIBOBJ([wmemcmp])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_WMEMCMP], [test $HAVE_WMEMCMP = 0])
 gl_WCHAR_MODULE_INDICATOR([wmemcmp])
 
 Makefile.am:
+if GL_COND_OBJ_WMEMCMP
+lib_SOURCES += wmemcmp.c
+endif
 
 Include:
 <wchar.h>
diff --git a/modules/wmemcpy b/modules/wmemcpy
index f0d22cea68..e45e94fe70 100644
--- a/modules/wmemcpy
+++ b/modules/wmemcpy
@@ -11,12 +11,13 @@ wchar
 
 configure.ac:
 gl_FUNC_WMEMCPY
-if test $HAVE_WMEMCPY = 0; then
-  AC_LIBOBJ([wmemcpy])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_WMEMCPY], [test $HAVE_WMEMCPY = 0])
 gl_WCHAR_MODULE_INDICATOR([wmemcpy])
 
 Makefile.am:
+if GL_COND_OBJ_WMEMCPY
+lib_SOURCES += wmemcpy.c
+endif
 
 Include:
 <wchar.h>
diff --git a/modules/wmemmove b/modules/wmemmove
index 359e0a31a6..3520526774 100644
--- a/modules/wmemmove
+++ b/modules/wmemmove
@@ -11,12 +11,13 @@ wchar
 
 configure.ac:
 gl_FUNC_WMEMMOVE
-if test $HAVE_WMEMMOVE = 0; then
-  AC_LIBOBJ([wmemmove])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_WMEMMOVE], [test $HAVE_WMEMMOVE = 0])
 gl_WCHAR_MODULE_INDICATOR([wmemmove])
 
 Makefile.am:
+if GL_COND_OBJ_WMEMMOVE
+lib_SOURCES += wmemmove.c
+endif
 
 Include:
 <wchar.h>
diff --git a/modules/wmempcpy b/modules/wmempcpy
index edb4c5f9c6..7548b2a74b 100644
--- a/modules/wmempcpy
+++ b/modules/wmempcpy
@@ -10,12 +10,13 @@ wchar
 
 configure.ac:
 gl_FUNC_WMEMPCPY
-if test $HAVE_WMEMPCPY = 0; then
-  AC_LIBOBJ([wmempcpy])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_WMEMPCPY], [test $HAVE_WMEMPCPY = 0])
 gl_WCHAR_MODULE_INDICATOR([wmempcpy])
 
 Makefile.am:
+if GL_COND_OBJ_WMEMPCPY
+lib_SOURCES += wmempcpy.c
+endif
 
 Include:
 <wchar.h>
diff --git a/modules/wmemset b/modules/wmemset
index daa018e55d..5145a65a28 100644
--- a/modules/wmemset
+++ b/modules/wmemset
@@ -11,12 +11,13 @@ wchar
 
 configure.ac:
 gl_FUNC_WMEMSET
-if test $HAVE_WMEMSET = 0; then
-  AC_LIBOBJ([wmemset])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_WMEMSET], [test $HAVE_WMEMSET = 0])
 gl_WCHAR_MODULE_INDICATOR([wmemset])
 
 Makefile.am:
+if GL_COND_OBJ_WMEMSET
+lib_SOURCES += wmemset.c
+endif
 
 Include:
 <wchar.h>
diff --git a/modules/write b/modules/write
index 90df27bc85..f32cbc7076 100644
--- a/modules/write
+++ b/modules/write
@@ -13,13 +13,16 @@ msvc-nothrow    [test $REPLACE_WRITE = 1]
 
 configure.ac:
 gl_FUNC_WRITE
-if test $REPLACE_WRITE = 1; then
-  AC_LIBOBJ([write])
+gl_CONDITIONAL([GL_COND_OBJ_WRITE], [test $REPLACE_WRITE = 1])
+AM_COND_IF([GL_COND_OBJ_WRITE], [
   gl_PREREQ_WRITE
-fi
+])
 gl_UNISTD_MODULE_INDICATOR([write])
 
 Makefile.am:
+if GL_COND_OBJ_WRITE
+lib_SOURCES += write.c
+endif
 
 Include:
 <unistd.h>