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.

ChangeLog

@@ -1,3 +1,457 @@
+2022-01-09  Bruno Haible  <bruno@clisp.org>
+
+	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.
+
 2022-01-09  Bruno Haible  <bruno@clisp.org>
 
 	obstack: Move AC_LIBOBJ invocation to the module description.

modules/_Exit

@@ -11,13 +11,16 @@ unistd
 
 configure.ac:
 gl_FUNC__EXIT
-if test $HAVE__EXIT = 0; then
+gl_CONDITIONAL([GL_COND_OBJ__EXIT], [test $HAVE__EXIT = 0])
-  AC_LIBOBJ([_Exit])
+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>

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
+gl_CONDITIONAL([GL_COND_OBJ_ACCEPT], [test "$ac_cv_header_winsock2_h" = yes])
-  AC_LIBOBJ([accept])
-fi
 gl_SYS_SOCKET_MODULE_INDICATOR([accept])
 
 Makefile.am:
+if GL_COND_OBJ_ACCEPT
+lib_SOURCES += accept.c
+endif
 
 Include:
 <sys/socket.h>

modules/access

@@ -11,12 +11,13 @@ fcntl
 
 configure.ac:
 gl_FUNC_ACCESS
-if test $REPLACE_ACCESS = 1; then
+gl_CONDITIONAL([GL_COND_OBJ_ACCESS], [test $REPLACE_ACCESS = 1])
-  AC_LIBOBJ([access])
-fi
 gl_UNISTD_MODULE_INDICATOR([access])
 
 Makefile.am:
+if GL_COND_OBJ_ACCESS
+lib_SOURCES += access.c
+endif
 
 Include:
 <unistd.h>

modules/acosf

@@ -12,12 +12,13 @@ acos            [test $HAVE_ACOSF = 0]
 
 configure.ac:
 gl_FUNC_ACOSF
-if test $HAVE_ACOSF = 0; then
+gl_CONDITIONAL([GL_COND_OBJ_ACOSF], [test $HAVE_ACOSF = 0])
-  AC_LIBOBJ([acosf])
-fi
 gl_MATH_MODULE_INDICATOR([acosf])
 
 Makefile.am:
+if GL_COND_OBJ_ACOSF
+lib_SOURCES += acosf.c
+endif
 
 Include:
 <math.h>

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
+gl_CONDITIONAL([GL_COND_OBJ_ACOSL], [test $HAVE_ACOSL = 0])
-  AC_LIBOBJ([acosl])
-fi
 gl_MATH_MODULE_INDICATOR([acosl])
 
 Makefile.am:
+if GL_COND_OBJ_ACOSL
+lib_SOURCES += acosl.c
+endif
 
 Include:
 <math.h>

modules/aligned_alloc

@@ -11,12 +11,13 @@ stdlib
 
 configure.ac:
 gl_FUNC_ALIGNED_ALLOC
-if test $REPLACE_ALIGNED_ALLOC = 1; then
+gl_CONDITIONAL([GL_COND_OBJ_ALIGNED_ALLOC], [test $REPLACE_ALIGNED_ALLOC = 1])
-  AC_LIBOBJ([aligned_alloc])
-fi
 gl_STDLIB_MODULE_INDICATOR([aligned_alloc])
 
 Makefile.am:
+if GL_COND_OBJ_ALIGNED_ALLOC
+lib_SOURCES += aligned_alloc.c
+endif
 
 Include:
 <stdlib.h>

modules/alphasort

@@ -11,13 +11,16 @@ extensions
 
 configure.ac:
 gl_FUNC_ALPHASORT
-if test $HAVE_ALPHASORT = 0; then
+gl_CONDITIONAL([GL_COND_OBJ_ALPHASORT], [test $HAVE_ALPHASORT = 0])
-  AC_LIBOBJ([alphasort])
+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>

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
+gl_CONDITIONAL([GL_COND_OBJ_ARGZ], [test -n "$ARGZ_H"])
-  AC_LIBOBJ([argz])
-fi
 
 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>
 

modules/asinf

@@ -12,12 +12,13 @@ asin            [test $HAVE_ASINF = 0]
 
 configure.ac:
 gl_FUNC_ASINF
-if test $HAVE_ASINF = 0; then
+gl_CONDITIONAL([GL_COND_OBJ_ASINF], [test $HAVE_ASINF = 0])
-  AC_LIBOBJ([asinf])
-fi
 gl_MATH_MODULE_INDICATOR([asinf])
 
 Makefile.am:
+if GL_COND_OBJ_ASINF
+lib_SOURCES += asinf.c
+endif
 
 Include:
 <math.h>

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
+gl_CONDITIONAL([GL_COND_OBJ_ASINL], [test $HAVE_ASINL = 0])
-  AC_LIBOBJ([asinl])
-fi
 gl_MATH_MODULE_INDICATOR([asinl])
 
 Makefile.am:
+if GL_COND_OBJ_ASINL
+lib_SOURCES += asinl.c
+endif
 
 Include:
 <math.h>

modules/atan2f

@@ -12,12 +12,13 @@ atan2           [test $HAVE_ATAN2F = 0]
 
 configure.ac:
 gl_FUNC_ATAN2F
-if test $HAVE_ATAN2F = 0; then
+gl_CONDITIONAL([GL_COND_OBJ_ATAN2F], [test $HAVE_ATAN2F = 0])
-  AC_LIBOBJ([atan2f])
-fi
 gl_MATH_MODULE_INDICATOR([atan2f])
 
 Makefile.am:
+if GL_COND_OBJ_ATAN2F
+lib_SOURCES += atan2f.c
+endif
 
 Include:
 <math.h>

modules/atanf

@@ -12,12 +12,13 @@ atan            [test $HAVE_ATANF = 0]
 
 configure.ac:
 gl_FUNC_ATANF
-if test $HAVE_ATANF = 0; then
+gl_CONDITIONAL([GL_COND_OBJ_ATANF], [test $HAVE_ATANF = 0])
-  AC_LIBOBJ([atanf])
-fi
 gl_MATH_MODULE_INDICATOR([atanf])
 
 Makefile.am:
+if GL_COND_OBJ_ATANF
+lib_SOURCES += atanf.c
+endif
 
 Include:
 <math.h>

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
+gl_CONDITIONAL([GL_COND_OBJ_ATANL], [test $HAVE_ATANL = 0])
-  AC_LIBOBJ([atanl])
-fi
 gl_MATH_MODULE_INDICATOR([atanl])
 
 Makefile.am:
+if GL_COND_OBJ_ATANL
+lib_SOURCES += atanl.c
+endif
 
 Include:
 <math.h>

modules/atexit

@@ -15,12 +15,15 @@ Depends-on:
 
 configure.ac:
 gl_FUNC_ATEXIT
-if test $ac_cv_func_atexit = no; then
+gl_CONDITIONAL([GL_COND_OBJ_ATEXIT], [test $ac_cv_func_atexit = no])
-  AC_LIBOBJ([atexit])
+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>

modules/atoll

@@ -10,13 +10,16 @@ strtoll         [test $HAVE_ATOLL = 0]
 
 configure.ac:
 gl_FUNC_ATOLL
-if test $HAVE_ATOLL = 0; then
+gl_CONDITIONAL([GL_COND_OBJ_ATOLL], [test $HAVE_ATOLL = 0])
-  AC_LIBOBJ([atoll])
+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>

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
+gl_CONDITIONAL([GL_COND_OBJ_BIND], [test "$ac_cv_header_winsock2_h" = yes])
-  AC_LIBOBJ([bind])
-fi
 gl_SYS_SOCKET_MODULE_INDICATOR([bind])
 
 Makefile.am:
+if GL_COND_OBJ_BIND
+lib_SOURCES += bind.c
+endif
 
 Include:
 <sys/socket.h>

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
+gl_CONDITIONAL([GL_COND_OBJ_BTOWC],
-  AC_LIBOBJ([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>

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
+gl_CONDITIONAL([GL_COND_OBJ_C32RTOMB],
-  AC_LIBOBJ([c32rtomb])
+               [test $HAVE_C32RTOMB = 0 || test $REPLACE_C32RTOMB = 1])
-fi
 gl_UCHAR_MODULE_INDICATOR([c32rtomb])
 
 Makefile.am:
+if GL_COND_OBJ_C32RTOMB
+lib_SOURCES += c32rtomb.c
+endif
 
 Include:
 <uchar.h>

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
+gl_CONDITIONAL([GL_COND_OBJ_CANONICALIZE_LGPL],
-  AC_LIBOBJ([canonicalize-lgpl])
+               [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1])
-fi
 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>

modules/cbrt

@@ -16,12 +16,13 @@ ldexp           [test $HAVE_CBRT = 0]
 
 configure.ac:
 gl_FUNC_CBRT
-if test $HAVE_CBRT = 0; then
+gl_CONDITIONAL([GL_COND_OBJ_CBRT], [test $HAVE_CBRT = 0])
-  AC_LIBOBJ([cbrt])
-fi
 gl_MATH_MODULE_INDICATOR([cbrt])
 
 Makefile.am:
+if GL_COND_OBJ_CBRT
+lib_SOURCES += cbrt.c
+endif
 
 Include:
 <math.h>

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
+gl_CONDITIONAL([GL_COND_OBJ_CBRTF],
-  AC_LIBOBJ([cbrtf])
+               [test $HAVE_CBRTF = 0 || test $REPLACE_CBRTF = 1])
-fi
 gl_MATH_MODULE_INDICATOR([cbrtf])
 
 Makefile.am:
+if GL_COND_OBJ_CBRTF
+lib_SOURCES += cbrtf.c
+endif
 
 Include:
 <math.h>

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
+gl_CONDITIONAL([GL_COND_OBJ_CBRTL],
-  AC_LIBOBJ([cbrtl])
+               [test $HAVE_CBRTL = 0 || test $REPLACE_CBRTL = 1])
-fi
 gl_MATH_MODULE_INDICATOR([cbrtl])
 
 Makefile.am:
+if GL_COND_OBJ_CBRTL
+lib_SOURCES += cbrtl.c
+endif
 
 Include:
 <math.h>

modules/ceil

@@ -11,12 +11,13 @@ float           [test $REPLACE_CEIL = 1]
 
 configure.ac:
 gl_FUNC_CEIL
-if test $REPLACE_CEIL = 1; then
+gl_CONDITIONAL([GL_COND_OBJ_CEIL], [test $REPLACE_CEIL = 1])
-  AC_LIBOBJ([ceil])
-fi
 gl_MATH_MODULE_INDICATOR([ceil])
 
 Makefile.am:
+if GL_COND_OBJ_CEIL
+lib_SOURCES += ceil.c
+endif
 
 Include:
 <math.h>

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
+gl_CONDITIONAL([GL_COND_OBJ_CEILF],
-  AC_LIBOBJ([ceilf])
+               [test $HAVE_DECL_CEILF = 0 || test $REPLACE_CEILF = 1])
-fi
 gl_MATH_MODULE_INDICATOR([ceilf])
 
 Makefile.am:
+if GL_COND_OBJ_CEILF
+lib_SOURCES += ceilf.c
+endif
 
 Include:
 <math.h>

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
+gl_CONDITIONAL([GL_COND_OBJ_CEILL],
-  AC_LIBOBJ([ceill])
+               [test $HAVE_DECL_CEILL = 0 || test $REPLACE_CEILL = 1])
-fi
 gl_MATH_MODULE_INDICATOR([ceill])
 
 Makefile.am:
+if GL_COND_OBJ_CEILL
+lib_SOURCES += ceill.c
+endif
 
 Include:
 <math.h>

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
+gl_CONDITIONAL([GL_COND_OBJ_CHDIR_LONG],
-  AC_LIBOBJ([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"

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
+gl_CONDITIONAL([GL_COND_OBJ_CHOWN],
-  AC_LIBOBJ([chown])
+               [test $HAVE_CHOWN = 0 || test $REPLACE_CHOWN = 1])
-fi
+gl_CONDITIONAL([GL_COND_OBJ_FCHOWN_STUB],
-if test $REPLACE_CHOWN = 1 && test $ac_cv_func_fchown = no; then
+               [test $REPLACE_CHOWN = 1 && test $ac_cv_func_fchown = no])
-  AC_LIBOBJ([fchown-stub])
-fi
 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>

modules/close

@@ -12,12 +12,13 @@ msvc-inval      [test $REPLACE_CLOSE = 1]
 
 configure.ac:
 gl_FUNC_CLOSE
-if test $REPLACE_CLOSE = 1; then
+gl_CONDITIONAL([GL_COND_OBJ_CLOSE], [test $REPLACE_CLOSE = 1])
-  AC_LIBOBJ([close])
-fi
 gl_UNISTD_MODULE_INDICATOR([close])
 
 Makefile.am:
+if GL_COND_OBJ_CLOSE
+lib_SOURCES += close.c
+endif
 
 Include:
 <unistd.h>

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
+gl_CONDITIONAL([GL_COND_OBJ_CLOSEDIR],
-  AC_LIBOBJ([closedir])
+               [test $HAVE_CLOSEDIR = 0 || test $REPLACE_CLOSEDIR = 1])
-fi
 gl_DIRENT_MODULE_INDICATOR([closedir])
 
 Makefile.am:
+if GL_COND_OBJ_CLOSEDIR
+lib_SOURCES += closedir.c
+endif
 
 Include:
 <dirent.h>

modules/cnd

@@ -11,12 +11,13 @@ gettimeofday
 
 configure.ac:
 AC_REQUIRE([gl_THREADS_H])
-if test $HAVE_THREADS_H = 0; then
+gl_CONDITIONAL([GL_COND_OBJ_CND], [test $HAVE_THREADS_H = 0])
-  AC_LIBOBJ([cnd])
-fi
 gl_THREADS_MODULE_INDICATOR([cnd])
 
 Makefile.am:
+if GL_COND_OBJ_CND
+lib_SOURCES += cnd.c
+endif
 
 Include:
 <threads.h>

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
+gl_CONDITIONAL([GL_COND_OBJ_CONNECT], [test "$ac_cv_header_winsock2_h" = yes])
-  AC_LIBOBJ([connect])
-fi
 gl_SYS_SOCKET_MODULE_INDICATOR([connect])
 
 Makefile.am:
+if GL_COND_OBJ_CONNECT
+lib_SOURCES += connect.c
+endif
 
 Include:
 <sys/socket.h>

modules/copy-file-range

@@ -11,12 +11,13 @@ unistd
 
 configure.ac:
 gl_FUNC_COPY_FILE_RANGE
-if test $HAVE_COPY_FILE_RANGE = 0; then
+gl_CONDITIONAL([GL_COND_OBJ_COPY_FILE_RANGE], [test $HAVE_COPY_FILE_RANGE = 0])
-  AC_LIBOBJ([copy-file-range])
-fi
 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>

modules/copysign

@@ -12,12 +12,13 @@ signbit         [test $HAVE_COPYSIGN = 0]
 
 configure.ac:
 gl_FUNC_COPYSIGN
-if test $HAVE_COPYSIGN = 0; then
+gl_CONDITIONAL([GL_COND_OBJ_COPYSIGN], [test $HAVE_COPYSIGN = 0])
-  AC_LIBOBJ([copysign])
-fi
 gl_MATH_MODULE_INDICATOR([copysign])
 
 Makefile.am:
+if GL_COND_OBJ_COPYSIGN
+lib_SOURCES += copysign.c
+endif
 
 Include:
 <math.h>

modules/copysignf

@@ -13,12 +13,13 @@ signbit         [test $HAVE_COPYSIGNF = 0]
 
 configure.ac:
 gl_FUNC_COPYSIGNF
-if test $HAVE_COPYSIGNF = 0; then
+gl_CONDITIONAL([GL_COND_OBJ_COPYSIGNF], [test $HAVE_COPYSIGNF = 0])
-  AC_LIBOBJ([copysignf])
-fi
 gl_MATH_MODULE_INDICATOR([copysignf])
 
 Makefile.am:
+if GL_COND_OBJ_COPYSIGNF
+lib_SOURCES += copysignf.c
+endif
 
 Include:
 <math.h>

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
+gl_CONDITIONAL([GL_COND_OBJ_COPYSIGNL], [test $HAVE_COPYSIGNL = 0])
-  AC_LIBOBJ([copysignl])
-fi
 gl_MATH_MODULE_INDICATOR([copysignl])
 
 Makefile.am:
+if GL_COND_OBJ_COPYSIGNL
+lib_SOURCES += copysignl.c
+endif
 
 Include:
 <math.h>

modules/cosf

@@ -12,12 +12,13 @@ cos             [test $HAVE_COSF = 0]
 
 configure.ac:
 gl_FUNC_COSF
-if test $HAVE_COSF = 0; then
+gl_CONDITIONAL([GL_COND_OBJ_COSF], [test $HAVE_COSF = 0])
-  AC_LIBOBJ([cosf])
-fi
 gl_MATH_MODULE_INDICATOR([cosf])
 
 Makefile.am:
+if GL_COND_OBJ_COSF
+lib_SOURCES += cosf.c
+endif
 
 Include:
 <math.h>

modules/coshf

@@ -12,12 +12,13 @@ cosh            [test $HAVE_COSHF = 0]
 
 configure.ac:
 gl_FUNC_COSHF
-if test $HAVE_COSHF = 0; then
+gl_CONDITIONAL([GL_COND_OBJ_COSHF], [test $HAVE_COSHF = 0])
-  AC_LIBOBJ([coshf])
-fi
 gl_MATH_MODULE_INDICATOR([coshf])
 
 Makefile.am:
+if GL_COND_OBJ_COSHF
+lib_SOURCES += coshf.c
+endif
 
 Include:
 <math.h>

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
+gl_CONDITIONAL([GL_COND_OBJ_COSL], [test $HAVE_COSL = 0])
-  AC_LIBOBJ([cosl])
+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>

modules/creat

@@ -12,12 +12,13 @@ largefile
 
 configure.ac:
 gl_FUNC_CREAT
-if test $REPLACE_CREAT = 1; then
+gl_CONDITIONAL([GL_COND_OBJ_CREAT], [test $REPLACE_CREAT = 1])
-  AC_LIBOBJ([creat])
-fi
 gl_FCNTL_MODULE_INDICATOR([creat])
 
 Makefile.am:
+if GL_COND_OBJ_CREAT
+lib_SOURCES += creat.c
+endif
 
 Include:
 <fcntl.h>

modules/crypto/gc

@@ -14,17 +14,18 @@ open
 
 configure.ac:
 gl_GC
-if test "$ac_cv_libgcrypt" = yes; then
+gl_CONDITIONAL([GL_COND_OBJ_GC_LIBGCRYPT], [test "$ac_cv_libgcrypt" = yes])
-  AC_LIBOBJ([gc-libgcrypt])
-else
-  AC_LIBOBJ([gc-gnulib])
-fi
 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

modules/ctime

@@ -10,12 +10,13 @@ time
 
 configure.ac:
 gl_FUNC_CTIME
-if test $REPLACE_CTIME = 1; then
+gl_CONDITIONAL([GL_COND_OBJ_CTIME], [test $REPLACE_CTIME = 1])
-  AC_LIBOBJ([ctime])
-fi
 gl_TIME_MODULE_INDICATOR([ctime])
 
 Makefile.am:
+if GL_COND_OBJ_CTIME
+lib_SOURCES += ctime.c
+endif
 
 Include:
 <time.h>

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 \
+gl_CONDITIONAL([GL_COND_OBJ_DIRFD],
-   || test $REPLACE_DIRFD = 1; then
+               [test $ac_cv_func_dirfd = no && test $gl_cv_func_dirfd_macro = no || test $REPLACE_DIRFD = 1])
-  AC_LIBOBJ([dirfd])
+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>

modules/dup

@@ -11,13 +11,16 @@ msvc-inval      [test $REPLACE_DUP = 1]
 
 configure.ac:
 gl_FUNC_DUP
-if test $REPLACE_DUP = 1; then
+gl_CONDITIONAL([GL_COND_OBJ_DUP], [test $REPLACE_DUP = 1])
-  AC_LIBOBJ([dup])
+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>

modules/dup2

@@ -12,13 +12,16 @@ msvc-nothrow    [test $REPLACE_DUP2 = 1]
 
 configure.ac:
 gl_FUNC_DUP2
-if test $REPLACE_DUP2 = 1; then
+gl_CONDITIONAL([GL_COND_OBJ_DUP2], [test $REPLACE_DUP2 = 1])
-  AC_LIBOBJ([dup2])
+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>

modules/duplocale

@@ -11,13 +11,16 @@ setlocale-null  [test $REPLACE_DUPLOCALE = 1]
 
 configure.ac:
 gl_FUNC_DUPLOCALE
-if test $REPLACE_DUPLOCALE = 1; then
+gl_CONDITIONAL([GL_COND_OBJ_DUPLOCALE], [test $REPLACE_DUPLOCALE = 1])
-  AC_LIBOBJ([duplocale])
+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>

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], [
+gl_CONDITIONAL([GL_COND_OBJ_ERROR], [test "$ac_cv_lib_error_at_line" = no])
-  AC_LIBOBJ([error])
+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"

modules/euidaccess

@@ -16,13 +16,16 @@ sys_stat        [test $HAVE_EUIDACCESS = 0]
 
 configure.ac:
 gl_FUNC_EUIDACCESS
-if test $HAVE_EUIDACCESS = 0; then
+gl_CONDITIONAL([GL_COND_OBJ_EUIDACCESS], [test $HAVE_EUIDACCESS = 0])
-  AC_LIBOBJ([euidaccess])
+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>

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
+gl_CONDITIONAL([GL_COND_OBJ_EXECINFO], [$GL_GENERATE_EXECINFO_H])
-  AC_LIBOBJ([execinfo])
-fi
 
 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>
 

modules/execl

@@ -12,12 +12,13 @@ malloca         [test $REPLACE_EXECL = 1]
 
 configure.ac:
 gl_FUNC_EXECL
-if test $REPLACE_EXECL = 1; then
+gl_CONDITIONAL([GL_COND_OBJ_EXECL], [test $REPLACE_EXECL = 1])
-  AC_LIBOBJ([execl])
-fi
 gl_UNISTD_MODULE_INDICATOR([execl])
 
 Makefile.am:
+if GL_COND_OBJ_EXECL
+lib_SOURCES += execl.c
+endif
 
 Include:
 <unistd.h>

modules/execle

@@ -12,12 +12,13 @@ malloca         [test $REPLACE_EXECLE = 1]
 
 configure.ac:
 gl_FUNC_EXECLE
-if test $REPLACE_EXECLE = 1; then
+gl_CONDITIONAL([GL_COND_OBJ_EXECLE], [test $REPLACE_EXECLE = 1])
-  AC_LIBOBJ([execle])
-fi
 gl_UNISTD_MODULE_INDICATOR([execle])
 
 Makefile.am:
+if GL_COND_OBJ_EXECLE
+lib_SOURCES += execle.c
+endif
 
 Include:
 <unistd.h>

modules/execlp

@@ -12,12 +12,13 @@ malloca         [test $REPLACE_EXECLP = 1]
 
 configure.ac:
 gl_FUNC_EXECLP
-if test $REPLACE_EXECLP = 1; then
+gl_CONDITIONAL([GL_COND_OBJ_EXECLP], [test $REPLACE_EXECLP = 1])
-  AC_LIBOBJ([execlp])
-fi
 gl_UNISTD_MODULE_INDICATOR([execlp])
 
 Makefile.am:
+if GL_COND_OBJ_EXECLP
+lib_SOURCES += execlp.c
+endif
 
 Include:
 <unistd.h>

modules/execv

@@ -12,12 +12,13 @@ execve          [test $REPLACE_EXECV = 1]
 
 configure.ac:
 gl_FUNC_EXECV
-if test $REPLACE_EXECV = 1; then
+gl_CONDITIONAL([GL_COND_OBJ_EXECV], [test $REPLACE_EXECV = 1])
-  AC_LIBOBJ([execv])
-fi
 gl_UNISTD_MODULE_INDICATOR([execv])
 
 Makefile.am:
+if GL_COND_OBJ_EXECV
+lib_SOURCES += execv.c
+endif
 
 Include:
 <unistd.h>

modules/execve

@@ -14,12 +14,13 @@ waitpid         [test $REPLACE_EXECVE = 1]
 
 configure.ac:
 gl_FUNC_EXECVE
-if test $REPLACE_EXECVE = 1; then
+gl_CONDITIONAL([GL_COND_OBJ_EXECVE], [test $REPLACE_EXECVE = 1])
-  AC_LIBOBJ([execve])
-fi
 gl_UNISTD_MODULE_INDICATOR([execve])
 
 Makefile.am:
+if GL_COND_OBJ_EXECVE
+lib_SOURCES += execve.c
+endif
 
 Include:
 <unistd.h>

modules/execvp

@@ -12,12 +12,13 @@ execvpe         [test $REPLACE_EXECVP = 1]
 
 configure.ac:
 gl_FUNC_EXECVP
-if test $REPLACE_EXECVP = 1; then
+gl_CONDITIONAL([GL_COND_OBJ_EXECVP], [test $REPLACE_EXECVP = 1])
-  AC_LIBOBJ([execvp])
-fi
 gl_UNISTD_MODULE_INDICATOR([execvp])
 
 Makefile.am:
+if GL_COND_OBJ_EXECVP
+lib_SOURCES += execvp.c
+endif
 
 Include:
 <unistd.h>

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
+gl_CONDITIONAL([GL_COND_OBJ_EXECVPE],
-  AC_LIBOBJ([execvpe])
+               [test $HAVE_EXECVPE = 0 || test $REPLACE_EXECVPE = 1])
-fi
 gl_UNISTD_MODULE_INDICATOR([execvpe])
 
 Makefile.am:
+if GL_COND_OBJ_EXECVPE
+lib_SOURCES += execvpe.c
+endif
 
 Include:
 <unistd.h>

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
+gl_CONDITIONAL([GL_COND_OBJ_EXP2],
-  AC_LIBOBJ([exp2])
+               [test $HAVE_EXP2 = 0 || test $REPLACE_EXP2 = 1])
-fi
 gl_MATH_MODULE_INDICATOR([exp2])
 
 Makefile.am:
+if GL_COND_OBJ_EXP2
+lib_SOURCES += exp2.c
+endif
 
 Include:
 <math.h>

modules/exp2f

@@ -12,12 +12,13 @@ exp2            [test $HAVE_EXP2F = 0]
 
 configure.ac:
 gl_FUNC_EXP2F
-if test $HAVE_EXP2F = 0; then
+gl_CONDITIONAL([GL_COND_OBJ_EXP2F], [test $HAVE_EXP2F = 0])
-  AC_LIBOBJ([exp2f])
-fi
 gl_MATH_MODULE_INDICATOR([exp2f])
 
 Makefile.am:
+if GL_COND_OBJ_EXP2F
+lib_SOURCES += exp2f.c
+endif
 
 Include:
 <math.h>

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
+gl_CONDITIONAL([GL_COND_OBJ_EXP2L],
-  AC_LIBOBJ([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>

modules/expf

@@ -12,12 +12,13 @@ exp             [test $HAVE_EXPF = 0]
 
 configure.ac:
 gl_FUNC_EXPF
-if test $HAVE_EXPF = 0; then
+gl_CONDITIONAL([GL_COND_OBJ_EXPF], [test $HAVE_EXPF = 0])
-  AC_LIBOBJ([expf])
-fi
 gl_MATH_MODULE_INDICATOR([expf])
 
 Makefile.am:
+if GL_COND_OBJ_EXPF
+lib_SOURCES += expf.c
+endif
 
 Include:
 <math.h>

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
+gl_CONDITIONAL([GL_COND_OBJ_EXPL],
-  AC_LIBOBJ([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>

modules/explicit_bzero

@@ -11,13 +11,16 @@ string
 
 configure.ac:
 gl_FUNC_EXPLICIT_BZERO
-if test $HAVE_EXPLICIT_BZERO = 0; then
+gl_CONDITIONAL([GL_COND_OBJ_EXPLICIT_BZERO], [test $HAVE_EXPLICIT_BZERO = 0])
-  AC_LIBOBJ([explicit_bzero])
+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>

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
+gl_CONDITIONAL([GL_COND_OBJ_EXPM1],
-  AC_LIBOBJ([expm1])
+               [test $HAVE_EXPM1 = 0 || test $REPLACE_EXPM1 = 1])
-fi
 gl_MATH_MODULE_INDICATOR([expm1])
 
 Makefile.am:
+if GL_COND_OBJ_EXPM1
+lib_SOURCES += expm1.c
+endif
 
 Include:
 <math.h>

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
+gl_CONDITIONAL([GL_COND_OBJ_EXPM1F],
-  AC_LIBOBJ([expm1f])
+               [test $HAVE_EXPM1F = 0 || test $REPLACE_EXPM1F = 1])
-fi
 gl_MATH_MODULE_INDICATOR([expm1f])
 
 Makefile.am:
+if GL_COND_OBJ_EXPM1F
+lib_SOURCES += expm1f.c
+endif
 
 Include:
 <math.h>

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
+gl_CONDITIONAL([GL_COND_OBJ_EXPM1L],
-  AC_LIBOBJ([expm1l])
+               [test $HAVE_EXPM1L = 0 || test $REPLACE_EXPM1L = 1])
-fi
 gl_MATH_MODULE_INDICATOR([expm1l])
 
 Makefile.am:
+if GL_COND_OBJ_EXPM1L
+lib_SOURCES += expm1l.c
+endif
 
 Include:
 <math.h>

modules/fabsf

@@ -13,12 +13,13 @@ fabs            [test $HAVE_FABSF = 0]
 
 configure.ac:
 gl_FUNC_FABSF
-if test $HAVE_FABSF = 0; then
+gl_CONDITIONAL([GL_COND_OBJ_FABSF], [test $HAVE_FABSF = 0])
-  AC_LIBOBJ([fabsf])
-fi
 gl_MATH_MODULE_INDICATOR([fabsf])
 
 Makefile.am:
+if GL_COND_OBJ_FABSF
+lib_SOURCES += fabsf.c
+endif
 
 Include:
 <math.h>

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
+gl_CONDITIONAL([GL_COND_OBJ_FABSL],
-  AC_LIBOBJ([fabsl])
+               [test $HAVE_FABSL = 0 || test $REPLACE_FABSL = 1])
-fi
 gl_MATH_MODULE_INDICATOR([fabsl])
 
 Makefile.am:
+if GL_COND_OBJ_FABSL
+lib_SOURCES += fabsl.c
+endif
 
 Include:
 <math.h>

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
+gl_CONDITIONAL([GL_COND_OBJ_FACCESSAT],
-  AC_LIBOBJ([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>

modules/fchdir

@@ -30,13 +30,16 @@ sys_stat         [test $HAVE_FCHDIR = 0]
 
 configure.ac:
 gl_FUNC_FCHDIR
-if test $HAVE_FCHDIR = 0; then
+gl_CONDITIONAL([GL_COND_OBJ_FCHDIR], [test $HAVE_FCHDIR = 0])
-  AC_LIBOBJ([fchdir])
+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>

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
+gl_CONDITIONAL([GL_COND_OBJ_FCHMODAT],
-  AC_LIBOBJ([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>

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
+gl_CONDITIONAL([GL_COND_OBJ_FCHOWNAT],
-  AC_LIBOBJ([fchownat])
+               [test $HAVE_FCHOWNAT = 0 || test $REPLACE_FCHOWNAT = 1])
-fi
 gl_UNISTD_MODULE_INDICATOR([fchownat])
 
 Makefile.am:
+if GL_COND_OBJ_FCHOWNAT
+lib_SOURCES += fchownat.c
+endif
 
 Include:
 <unistd.h>

modules/fclose

@@ -15,12 +15,13 @@ msvc-inval      [test $REPLACE_FCLOSE = 1]
 
 configure.ac:
 gl_FUNC_FCLOSE
-if test $REPLACE_FCLOSE = 1; then
+gl_CONDITIONAL([GL_COND_OBJ_FCLOSE], [test $REPLACE_FCLOSE = 1])
-  AC_LIBOBJ([fclose])
-fi
 gl_STDIO_MODULE_INDICATOR([fclose])
 
 Makefile.am:
+if GL_COND_OBJ_FCLOSE
+lib_SOURCES += fclose.c
+endif
 
 Include:
 <stdio.h>

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
+gl_CONDITIONAL([GL_COND_OBJ_FCNTL],
-  AC_LIBOBJ([fcntl])
+               [test $HAVE_FCNTL = 0 || test $REPLACE_FCNTL = 1])
-fi
 gl_FCNTL_MODULE_INDICATOR([fcntl])
 
 Makefile.am:
+if GL_COND_OBJ_FCNTL
+lib_SOURCES += fcntl.c
+endif
 
 Include:
 <fcntl.h>

modules/fdatasync

@@ -11,12 +11,13 @@ unistd
 
 configure.ac:
 gl_FUNC_FDATASYNC
-if test $HAVE_FDATASYNC = 0; then
+gl_CONDITIONAL([GL_COND_OBJ_FDATASYNC], [test $HAVE_FDATASYNC = 0])
-  AC_LIBOBJ([fdatasync])
-fi
 gl_UNISTD_MODULE_INDICATOR([fdatasync])
 
 Makefile.am:
+if GL_COND_OBJ_FDATASYNC
+lib_SOURCES += fdatasync.c
+endif
 
 Include:
 <unistd.h>

modules/fdopen

@@ -11,13 +11,16 @@ msvc-inval      [test $REPLACE_FDOPEN = 1]
 
 configure.ac:
 gl_FUNC_FDOPEN
-if test $REPLACE_FDOPEN = 1; then
+gl_CONDITIONAL([GL_COND_OBJ_FDOPEN], [test $REPLACE_FDOPEN = 1])
-  AC_LIBOBJ([fdopen])
+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>

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
+gl_CONDITIONAL([GL_COND_OBJ_FDOPENDIR],
-  AC_LIBOBJ([fdopendir])
+               [test $HAVE_FDOPENDIR = 0 || test $REPLACE_FDOPENDIR = 1])
-fi
 gl_DIRENT_MODULE_INDICATOR([fdopendir])
 gl_MODULE_INDICATOR([fdopendir])
 
 Makefile.am:
+if GL_COND_OBJ_FDOPENDIR
+lib_SOURCES += fdopendir.c
+endif
 
 Include:
 <dirent.h>

modules/fflush

@@ -20,14 +20,17 @@ AC_REQUIRE([gl_SET_LARGEFILE_SOURCE])
 
 configure.ac:
 gl_FUNC_FFLUSH
-if test $REPLACE_FFLUSH = 1; then
+gl_CONDITIONAL([GL_COND_OBJ_FFLUSH], [test $REPLACE_FFLUSH = 1])
-  AC_LIBOBJ([fflush])
+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>

modules/ffs

@@ -10,12 +10,13 @@ strings
 
 configure.ac:
 gl_FUNC_FFS
-if test $HAVE_FFS = 0; then
+gl_CONDITIONAL([GL_COND_OBJ_FFS], [test $HAVE_FFS = 0])
-  AC_LIBOBJ([ffs])
-fi
 gl_STRINGS_MODULE_INDICATOR([ffs])
 
 Makefile.am:
+if GL_COND_OBJ_FFS
+lib_SOURCES += ffs.c
+endif
 
 Include:
 <strings.h>

modules/ffsl

@@ -13,12 +13,13 @@ ffs             [test $HAVE_FFSL = 0]
 
 configure.ac:
 gl_FUNC_FFSL
-if test $HAVE_FFSL = 0; then
+gl_CONDITIONAL([GL_COND_OBJ_FFSL], [test $HAVE_FFSL = 0])
-  AC_LIBOBJ([ffsl])
-fi
 gl_STRING_MODULE_INDICATOR([ffsl])
 
 Makefile.am:
+if GL_COND_OBJ_FFSL
+lib_SOURCES += ffsl.c
+endif
 
 Include:
 <string.h>

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
+gl_CONDITIONAL([GL_COND_OBJ_FFSLL],
-  AC_LIBOBJ([ffsll])
+               [test $HAVE_FFSLL = 0 || test $REPLACE_FFSLL = 1])
-fi
 gl_STRING_MODULE_INDICATOR([ffsll])
 
 Makefile.am:
+if GL_COND_OBJ_FFSLL
+lib_SOURCES += ffsll.c
+endif
 
 Include:
 <string.h>

modules/fileblocks

@@ -9,12 +9,16 @@ Depends-on:
 
 configure.ac:
 gl_FILEBLOCKS
-if test $ac_cv_member_struct_stat_st_blocks = no; then
+gl_CONDITIONAL([GL_COND_OBJ_FILEBLOCKS],
-  AC_LIBOBJ([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:
 

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
+gl_CONDITIONAL([GL_COND_OBJ_FLOAT], [test $REPLACE_FLOAT_LDBL = 1])
-  AC_LIBOBJ([float])
+gl_CONDITIONAL([GL_COND_OBJ_ITOLD], [test $REPLACE_ITOLD = 1])
-fi
-if test $REPLACE_ITOLD = 1; then
-  AC_LIBOBJ([itold])
-fi
 
 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>
 

modules/flock

@@ -11,13 +11,16 @@ msvc-nothrow    [test $HAVE_FLOCK = 0]
 
 configure.ac:
 gl_FUNC_FLOCK
-if test $HAVE_FLOCK = 0; then
+gl_CONDITIONAL([GL_COND_OBJ_FLOCK], [test $HAVE_FLOCK = 0])
-  AC_LIBOBJ([flock])
+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>

modules/floor

@@ -11,12 +11,13 @@ float           [test $REPLACE_FLOOR = 1]
 
 configure.ac:
 AC_REQUIRE([gl_FUNC_FLOOR])
-if test $REPLACE_FLOOR = 1; then
+gl_CONDITIONAL([GL_COND_OBJ_FLOOR], [test $REPLACE_FLOOR = 1])
-  AC_LIBOBJ([floor])
-fi
 gl_MATH_MODULE_INDICATOR([floor])
 
 Makefile.am:
+if GL_COND_OBJ_FLOOR
+lib_SOURCES += floor.c
+endif
 
 Include:
 <math.h>

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
+gl_CONDITIONAL([GL_COND_OBJ_FLOORF],
-  AC_LIBOBJ([floorf])
+               [test $HAVE_DECL_FLOORF = 0 || test $REPLACE_FLOORF = 1])
-fi
 gl_MATH_MODULE_INDICATOR([floorf])
 
 Makefile.am:
+if GL_COND_OBJ_FLOORF
+lib_SOURCES += floorf.c
+endif
 
 Include:
 <math.h>

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
+gl_CONDITIONAL([GL_COND_OBJ_FLOORL],
-  AC_LIBOBJ([floorl])
+               [test $HAVE_DECL_FLOORL = 0 || test $REPLACE_FLOORL = 1])
-fi
 gl_MATH_MODULE_INDICATOR([floorl])
 
 Makefile.am:
+if GL_COND_OBJ_FLOORL
+lib_SOURCES += floorl.c
+endif
 
 Include:
 <math.h>

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
+gl_CONDITIONAL([GL_COND_OBJ_FMA], [test $HAVE_FMA = 0 || test $REPLACE_FMA = 1])
-  AC_LIBOBJ([fma])
+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>

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
+gl_CONDITIONAL([GL_COND_OBJ_FMAF],
-  AC_LIBOBJ([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>

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
+gl_CONDITIONAL([GL_COND_OBJ_FMAL],
-  AC_LIBOBJ([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>

modules/fmod

@@ -19,12 +19,13 @@ isinf           [test $REPLACE_FMOD = 1]
 
 configure.ac:
 gl_FUNC_FMOD
-if test $REPLACE_FMOD = 1; then
+gl_CONDITIONAL([GL_COND_OBJ_FMOD], [test $REPLACE_FMOD = 1])
-  AC_LIBOBJ([fmod])
-fi
 gl_MATH_MODULE_INDICATOR([fmod])
 
 Makefile.am:
+if GL_COND_OBJ_FMOD
+lib_SOURCES += fmod.c
+endif
 
 Include:
 <math.h>

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
+gl_CONDITIONAL([GL_COND_OBJ_FMODF],
-  AC_LIBOBJ([fmodf])
+               [test $HAVE_FMODF = 0 || test $REPLACE_FMODF = 1])
-fi
 gl_MATH_MODULE_INDICATOR([fmodf])
 
 Makefile.am:
+if GL_COND_OBJ_FMODF
+lib_SOURCES += fmodf.c
+endif
 
 Include:
 <math.h>

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
+gl_CONDITIONAL([GL_COND_OBJ_FMODL],
-  AC_LIBOBJ([fmodl])
+               [test $HAVE_FMODL = 0 || test $REPLACE_FMODL = 1])
-fi
 gl_MATH_MODULE_INDICATOR([fmodl])
 
 Makefile.am:
+if GL_COND_OBJ_FMODL
+lib_SOURCES += fmodl.c
+endif
 
 Include:
 <math.h>

modules/forkpty

@@ -14,12 +14,14 @@ login_tty
 
 configure.ac:
 gl_FUNC_FORKPTY
-if test $HAVE_FORKPTY = 0 || test $REPLACE_FORKPTY = 1; then
+gl_CONDITIONAL([GL_COND_OBJ_FORKPTY],
-  AC_LIBOBJ([forkpty])
+               [test $HAVE_FORKPTY = 0 || test $REPLACE_FORKPTY = 1])
-fi
 gl_PTY_MODULE_INDICATOR([forkpty])
 
 Makefile.am:
+if GL_COND_OBJ_FORKPTY
+lib_SOURCES += forkpty.c
+endif
 
 Include:
 <pty.h>

modules/fpending

@@ -11,11 +11,12 @@ Depends-on:
 
 configure.ac:
 gl_FUNC_FPENDING
-if test $gl_cv_func___fpending = no; then
+gl_CONDITIONAL([GL_COND_OBJ_FPENDING], [test $gl_cv_func___fpending = no])
-  AC_LIBOBJ([fpending])
-fi
 
 Makefile.am:
+if GL_COND_OBJ_FPENDING
+lib_SOURCES += fpending.c
+endif
 
 Include:
 "fpending.h"

modules/fpurge

@@ -11,12 +11,14 @@ stdio
 
 configure.ac:
 gl_FUNC_FPURGE
-if test $HAVE_FPURGE = 0 || test $REPLACE_FPURGE = 1; then
+gl_CONDITIONAL([GL_COND_OBJ_FPURGE],
-  AC_LIBOBJ([fpurge])
+               [test $HAVE_FPURGE = 0 || test $REPLACE_FPURGE = 1])
-fi
 gl_STDIO_MODULE_INDICATOR([fpurge])
 
 Makefile.am:
+if GL_COND_OBJ_FPURGE
+lib_SOURCES += fpurge.c
+endif
 
 Include:
 <stdio.h>

modules/freadable

@@ -12,11 +12,12 @@ stdbool
 
 configure.ac:
 gl_FUNC_FREADABLE
-if test $ac_cv_func___freadable = no; then
+gl_CONDITIONAL([GL_COND_OBJ_FREADABLE], [test $ac_cv_func___freadable = no])
-  AC_LIBOBJ([freadable])
-fi
 
 Makefile.am:
+if GL_COND_OBJ_FREADABLE
+lib_SOURCES += freadable.c
+endif
 
 Include:
 "freadable.h"

modules/freadahead

@@ -12,11 +12,12 @@ Depends-on:
 
 configure.ac:
 gl_FUNC_FREADAHEAD
-if test $ac_cv_func___freadahead = no; then
+gl_CONDITIONAL([GL_COND_OBJ_FREADAHEAD], [test $ac_cv_func___freadahead = no])
-  AC_LIBOBJ([freadahead])
-fi
 
 Makefile.am:
+if GL_COND_OBJ_FREADAHEAD
+lib_SOURCES += freadahead.c
+endif
 
 Include:
 "freadahead.h"

modules/freadptr

@@ -11,11 +11,12 @@ Depends-on:
 
 configure.ac:
 gl_FUNC_FREADPTR
-if test $ac_cv_func___freadptr = no; then
+gl_CONDITIONAL([GL_COND_OBJ_FREADPTR], [test $ac_cv_func___freadptr = no])
-  AC_LIBOBJ([freadptr])
-fi
 
 Makefile.am:
+if GL_COND_OBJ_FREADPTR
+lib_SOURCES += freadptr.c
+endif
 
 Include:
 "freadptr.h"

modules/free-posix

@@ -12,13 +12,16 @@ wchar
 
 configure.ac:
 gl_FUNC_FREE
-if test $REPLACE_FREE = 1; then
+gl_CONDITIONAL([GL_COND_OBJ_FREE], [test $REPLACE_FREE = 1])
-  AC_LIBOBJ([free])
+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>

modules/freopen

@@ -13,13 +13,16 @@ largefile
 
 configure.ac:
 gl_FUNC_FREOPEN
-if test $REPLACE_FREOPEN = 1; then
+gl_CONDITIONAL([GL_COND_OBJ_FREOPEN], [test $REPLACE_FREOPEN = 1])
-  AC_LIBOBJ([freopen])
+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>