]> Savannah Git Hosting - gnulib.git/commitdiff
Use the GL_CFLAG_GNULIB_WARNINGS for most AC_LIBOBJ compilation units.
authorBruno Haible <bruno@clisp.org>
Sun, 9 Jan 2022 14:47:21 +0000 (15:47 +0100)
committerBruno Haible <bruno@clisp.org>
Sun, 9 Jan 2022 16:17:56 +0000 (17:17 +0100)
* 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.

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

index 3db6389801faa63b353ca9cde656c094ebac652c..49e529506698b037979098e37bbc4715b59b3582 100644 (file)
--- a/ChangeLog
+++ b/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.
index cefebdccd595790b1080b7b8c6fe9390f2b82bb5..fa4bde0554d0eb033a0b8d589b542bc161e938e3 100644 (file)
@@ -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>
index d95c8295f7f7c60f4b3819cd0a4fcd8bb67a76be..483b5364ec70557f6ee1480a776147c2d884614a 100644 (file)
@@ -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>
index 7434e021efb22aa92d224fd1e26029e1fab7825a..cc23d81cae24f8e6890fa03569ed8799364e822a 100644 (file)
@@ -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>
index 647b05ec77849f89256de8c87ad3636e9e891d61..77589dc012097cf4d42cb27dc83fb4bc68ea5bf4 100644 (file)
@@ -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>
index 2ca9ebe8759d409305df7d06055bbe5035cf391d..5ea80c6fdea1848365d89f76a9e5091bf033c2cd 100644 (file)
@@ -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>
index f7757f4a96c86c320faa838fbe05c5e04e40ae43..e04115ec9e62551d47730cc4ca79c743858f7864 100644 (file)
@@ -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>
index e5670571e1b2d0ef3e64c98572a4fa266d6f2713..786fcce5e6376185bf13f8f51ed7db7f2912149a 100644 (file)
@@ -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>
index 058aa65bc3d0def5806df2dab43089d768882b42..f93634799835782cf8f68f6ae6d81686af9f7ef9 100644 (file)
@@ -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>
 
index 13ff1fd018cdd9de02cc26704dd2a4729126a850..ed04fbc402589c59a433d2006428230196213406 100644 (file)
@@ -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>
index 8abb65b85ad2ab122f5e7a7538400b17e78b42c1..af0ba38daeee9505ec4cedc506c759c668d3c2ba 100644 (file)
@@ -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>
index 96d44071ae4616bce404ac8133d50064ee3f3262..fe1c9b8520c6a1cf0801c47c9e3691ccb2140413 100644 (file)
@@ -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>
index dda2d74e49f957d8beb2d91388ba319b84ecbded..c3caffc134948e5af8795061e38909c686ba8964 100644 (file)
@@ -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>
index a600846a31313d240e1ff5654fc0e48525b4dda0..b17201a8da017e653a20f725a425fbe837b59e14 100644 (file)
@@ -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>
index d01895fa5ae01cfb1f75686e7e2b4a5259dbed6e..b1ff39432011f74673819c73884fc239fe3efc99 100644 (file)
@@ -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>
index 69cda85117cf3ae12101d721e7d292035776d31a..ac5fdcb9b98400231612b480f0733b7bef113819 100644 (file)
@@ -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>
index bd0ef9d6490d0e5326e9cae8553e4a3ec078e0c9..f58407830e6e700636d073601e960149e06ce9ef 100644 (file)
@@ -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>
index 68f4066cc5a2d0e8bd95121453814c6c3faa600d..80d786cfa6c0f7232c4c9b09ad5f357a4448bcd8 100644 (file)
@@ -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>
index 9863d7020767ebad505f810839c47d6b9a2c807d..a8457721bb3e26d78875c96ce5693f3ce4508d52 100644 (file)
@@ -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>
index 0bc5591c5b10d94216b4896486288ef23ea2cc5e..252618e95e08a89473424a9a34fbe401a0df4717 100644 (file)
@@ -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>
index 05f61dca3e74e2ba453f2359eb9f05ba4761be5a..f77bd23b8d8d5cf3fad00294348fedf42f3bc81b 100644 (file)
@@ -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>
index d4d44a636c797d02a4888b6c71ccdab3b967d475..0a46424adf21018b82e692a3781152a77df24321 100644 (file)
@@ -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>
index cbfdd1f3d5d521cf7a371131c0d592861fd1bf39..92755d799ca9c78c766f8213e556bc5af9d74b92 100644 (file)
@@ -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>
index 98c7a9081aa711ce9f9bb29ffcfac3fa75920a89..3d2f5cc475ecb65307bdbd215f94a4640a427677 100644 (file)
@@ -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>
index fc04351d0e26a2f0bdbcd5b79f009a3ecc93882c..57daa285942539a6e8fd82e0ab62117349f12e31 100644 (file)
@@ -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>
index 49a5e765b930efd1b7a46c7fe4c552c2bcd2250d..0f38402e8257921b93946a94410b008f8802bb24 100644 (file)
@@ -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>
index 3cab294e675610391daabc8159243df9168c3476..c08ff622b468f14143cbf46c6521e11c6d8c17f9 100644 (file)
@@ -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"
index 9c7294b0ef30bfbae66968f9e3ce8edb2f8072e6..d3f2d1e10e35fffff7fad35f6cccf4fdc7bf344d 100644 (file)
@@ -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>
index 4f27823c4f0670bd00ecc9bf5c76604ba4ce733c..926ea855017a676372b90ec5185ea9318f8aa899 100644 (file)
@@ -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>
index cdc0de30fb2f83d87d07be8c4336e49d6ad1cc7b..9353e11f1c2cfd47c71d57d09b0286ca2f5b7013 100644 (file)
@@ -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>
index 6870479613f050fbc1d57844b280d1bde231e701..cb4ec4a5bd970d3d06d20c1cf572fa1beb57127c 100644 (file)
@@ -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>
index 91e1534c4377145bbf5ab0ffcdf2bfb26c12406f..cd21697b757d428d43771f3dbe770fef30f36e6e 100644 (file)
@@ -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>
index 42d6e6f311b28c4aee7602ebe5bfba782ab48892..e2a4ffef46f4ac6451d19382b40cf74e56410d53 100644 (file)
@@ -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>
index 33ee356e765c2d94d4e68b16376ebd3ab318070d..6c0a06126d9b96c249dd04d3aa1dc6ff429db9cb 100644 (file)
@@ -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>
index d06d8e994e351c5dcf16d8374cdff938766ee369..b30215afeda27391085d5df3c7d80ad473af0b9e 100644 (file)
@@ -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>
index 02ac52e094627737abf50910f946260613e3b2ef..d1c80583d744cd4f20b0e28bc0409e81639779a9 100644 (file)
@@ -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>
index 424ae56b1cf9565f11f86eb4b6a047cc1245812e..3adf1d6885e2ac592dd56fa181153775632a67bc 100644 (file)
@@ -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>
index 1eb5b8be5bceb35517b04bfb8d43aa6b412557d6..8af4caac5e3c5aff12d489df728144d63a8cd636 100644 (file)
@@ -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>
index 3b60a4e4b3fd37615022e3137cc7b77273037f86..4b0499f4a91c4e92b8994075204f136598ccabbb 100644 (file)
@@ -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>
index d95d6ba457d1aac652aa6192fbf986fedd0ea24c..a246c3fb1eba3794e7399ad696226ce79d2831b9 100644 (file)
@@ -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>
index 46ccde1334cadd51422d73aa5e8e6edd7d288af7..cd1d56b5c07d18c1528984b37ff456999777177a 100644 (file)
@@ -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
index d700ca87a699ccd4c22376650c290b262013b7d8..949f849b91ea2b275e7cdc51d53e2ad70e0f91e0 100644 (file)
@@ -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>
index 0ad0bf42c251a69eebd0f797e4bd1dc1ea686740..0ffcf7ebbd7f4bef34fa0e19e6daa22479e57fe9 100644 (file)
@@ -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>
index 46a6c96d30acbbb8bfafc1fae4d39d6bc023213a..2f42e07356f895aa345219fa5c3ce7ff23401fdc 100644 (file)
@@ -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>
index 70a28ded6925f33f4fe50c565b09acde33610968..acbc017069befd558726f7dd9fb4dc442145c3d2 100644 (file)
@@ -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>
index aaa12cd09db889987d4f15cbeaf0811ba45bf16f..0c6dc227574bc5b6b0392f6d697439d9975a2680 100644 (file)
@@ -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>
index 08370da7705718b934c1a168f136b28eb2359bfc..e8363528aabfc1f210aa6d2bf04dbf814ea303db 100644 (file)
@@ -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"
index 9240338f7b802e42c0ca936cce3f227c3ef256c2..43b09451992496168aa121a66ade168255a29fe4 100644 (file)
@@ -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>
index 4ac772ba496a8e8548ad6baf23d0d42162914b70..f93593e2613889ff82ecaf727fa584fd0238adb4 100644 (file)
@@ -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>
 
index 9d64c5c78eb3a5050c7e492a9eee281c086a7dcc..8465221c67d9fe7257e7591195843f5e2c89f1ca 100644 (file)
@@ -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>
index dd3c9ad96120535fd3043a4241d0bae300946d6a..586efa177c2561c8de0a8f147c9e1f9db95a2132 100644 (file)
@@ -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>
index b31191c7c40f7715b165e28a239e51e542f92fec..769b3f452837bfcc5a7e33b7e650aac5253d53de 100644 (file)
@@ -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>
index db64abbe7bb5da29144c24e941cdf13c3d21e6d0..244d79405f5166b26ba11ca542ab440f6f995e38 100644 (file)
@@ -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>
index ea381a20107463b5515a08bee7ffcbe8e9ab3060..caf0918350e426207761d4fb6a7053a7bd76ec83 100644 (file)
@@ -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>
index df2d31317208b60c6d377c69c697a46e65893b73..0436444d8c53b7eac2d8f56faa75ff4d0c3301da 100644 (file)
@@ -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>
index e29045dc66b2f206c78c23f2e5141820ae42315b..cc486e28d994eabedf090386e19fde20d888cd61 100644 (file)
@@ -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>
index 67fe2c1aa18340e39cb35a540cd7661bae3b1394..ca373f17c218d48fb62dad45589f070dc728e2b0 100644 (file)
@@ -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>
index cddf153171472387303c736761a90b48eac12d31..708ac7cefaa8f0481eee9542ac3fa78e4b6e7c1a 100644 (file)
@@ -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>
index bb75cf83a9be97562d59be0ea4ee55959d24a4d6..456d04d66af06626411e5e217110a26995ccbd33 100644 (file)
@@ -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>
index f3c35b7b50044abc340d36c5d2a9ab8f83fd2f4a..46acd2ea1d2e9f6e3e641980447b91b537a5a704 100644 (file)
@@ -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>
index 90a7e65bfd4b96f4734e8793796f8aa6ac6fec96..5bc8dd3bbd89c14dec5ae800e14b26eb266807a1 100644 (file)
@@ -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>
index 08fd3e4a90bbc757f41a066fec25f73b27e07d30..bb5f8a531097d4e656fdfd112405353afbc7b07c 100644 (file)
@@ -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>
index ef647333200e3827c8530ff0d16d1785ed203ac9..f351c1c4b220c2824770506aaf15ace63cd75639 100644 (file)
@@ -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>
index f5e3c35dd891040ca03884f696c06d567b71fbdf..77de66f4a2f804f6ae82f6fa6ee14d7f9fbb553a 100644 (file)
@@ -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>
index f7137e2e41204e2a7d6d9760148fb945ce3777bf..34fea130c84016dd59417cc9e1694706f10cbb8e 100644 (file)
@@ -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>
index 7083a90ac6feba6db18f2413e14c385b1b885e8f..ce9fbcbc368ad56e4a0506f7e8be17d34b7ac4e5 100644 (file)
@@ -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>
index 7ed9f92b0e0b14e56abb56a036490b71f41524af..9dab45ea1fbe80744798f7e5e8f8825e38950b1e 100644 (file)
@@ -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>
index 49098a210c46816e0b06e5d5cef6dfb73b33587b..a86c0992710fa236b50fefaa5dc3861cf8b78b0c 100644 (file)
@@ -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>
index 967e648b06a6e00c7b0563de6860c246826a96c9..13437a92f135c48298ed902a81924323499244bd 100644 (file)
@@ -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>
index 17cfe392fdd2ecebd5402595efa5ef7acea10388..26758bda861c6f7d5870c86b7c977fd98e9b2e85 100644 (file)
@@ -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>
index e14544ab2b7fa36ec015884b67cd986da06bed17..ea2f2e678c94a9179be894cb8c556e08514faf91 100644 (file)
@@ -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>
index f34e96ab9c736c1c3052a6e48e13d38aca0fbb4c..703de9e686c8d3df0dfdce323ba149e62a58469c 100644 (file)
@@ -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>
index 3ee0811c87b98f240f1dbac6122edb665363e6e8..ad5d6e93668f86efdcb03f8f0877cbeef920de16 100644 (file)
@@ -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>
index 62f710d9e5ad9d57488b1bc7e17a5e2d76bed4e1..bff4dc3a695e938759ab7ed6f0562a8842eca8a9 100644 (file)
@@ -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>
index a1d0280934f18f3b977cdb892324c43fa15b837a..c3af75a013f16252f7c4cb1c5fc86342316f0b8d 100644 (file)
@@ -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>
index 2d03867ecc3bf28caed50cdd011869322915c682..2dec7901679f344382bd284e33c929740be7d08e 100644 (file)
@@ -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>
index bda975a2a59262e951eb7fac775cb89f97b0940e..c12ab70138bf6c86523cf1ae0d342b10f9bbf75e 100644 (file)
@@ -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>
index 7d032b02a8695ef57c1fbc80a54af56e5863611d..90980fd728ad12e48c2a553e886db03802a14395 100644 (file)
@@ -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>
index a3217ec08ea21b720aa682bb62cb42770b58e9cb..02990c761da5195cfde6ab6fa9884d71eff2ba98 100644 (file)
@@ -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>
index dea0d97e800fd8fa945ad552fa8fd3045f641ab3..e215301a72a4c0986ac85f6128af7f5392cc2254 100644 (file)
@@ -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>
index 2deff815ee179cf9b55e1860dca898ace5342ffe..5647da233c563636d58025beb645f7bcafe70571 100644 (file)
@@ -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:
 
index d308d4412ff56b3f2414f9feb3af07b93de112ca..600de5ebee873ca918f5ea0fd33b4bd3b7427737 100644 (file)
@@ -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>
 
index f45f61637097de4152778a74bbfdd36b3a040e54..75ce48e584e019b5268fd272d1a00245c0c62772 100644 (file)
@@ -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>
index bd7d90dc7d771faf8acb35479b93b7addead0e39..23557eb8adbb7199307bbcd8e0921bea66df9f10 100644 (file)
@@ -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>
index cbf05d4dc01cb4f258ba7f9f292f7e93421b4333..f5a31d8c39446a2a92e855693a42f0da280fe237 100644 (file)
@@ -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>
index e3450f86535daf2a1fd38aff753cfa176482f97b..3e796ca42f936e79a4b47db16d85a2b807a35778 100644 (file)
@@ -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>
index 0d6558f36bcf128875d859a00cd1e41fd9c108e3..dc45a948262df3f05e75cf40ea357f1e9910ba83 100644 (file)
@@ -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>
index cbfea61b58c65a2a71ef4fee87cc81a4e61639f6..53fe229c10aa8cd4df5589b5f11d446d63d9bcf1 100644 (file)
@@ -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>
index 72c38d51d2b0f870a4b9efe64201eccb69058349..e24ff02a95f08d3a7bcd461ae8cc6ef000534286 100644 (file)
@@ -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>
index 0acfb4e4e8a94e3110d31416b4060a397d3ce62e..1711d2916437d9a82a8897d2c11c10a5bde9fac6 100644 (file)
@@ -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>
index 2d65f4378587c19a6b3bc7b702d9648194a5b551..5608ac2dfa76d07ef43f8a2eed10ce73c4634911 100644 (file)
@@ -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>
index f1ac6f88810464539b160d0a72281b06ff597d4c..8425394e5f5e752f4d2acfbd0e6c9506518069e4 100644 (file)
@@ -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>
index fdf5fe4fbdd04109bdcd05bfc7c5efd5bcc9db79..1f52b900cd743937b30db994e249e9fc3030b934 100644 (file)
@@ -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>
index 8dc4bee427db62ad84b26638ade0e5c0f30147e9..0aa326d1b00afb34fcb8a318f7314bcb3dc9ded4 100644 (file)
@@ -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"
index 54ab9ffd46529e620270f8385d9cead98e40ee3b..4834e41916bd1595b48809bb54d4cdc6bb0306ea 100644 (file)
@@ -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>
index 35e42a88ced9e6a165f9c573a7de4cf5822af2ba..66267ec6cde66cbd65ca1ad22576ac1c98714ec3 100644 (file)
@@ -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"
index ccd70fad748cef6c9cd85eb0211f4d76ef419b5f..ae9c63c2f24ea7a70d849b455212463eac8b34a5 100644 (file)
@@ -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"
index 7d56c90ec8fe23a08d45d418e801db58f92af16b..2925d22ba38a2b80f0c572c9055da8c50b2505d7 100644 (file)
@@ -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"
index 1d0056327a86d977e784a9cd1d59c784a06effeb..9d18421b642f9bebdef579a6da84bd29396d92df 100644 (file)
@@ -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>
index 41236bd533786391490ec8058920371e35a14b86..c7bcdc04e62bde0e272bc68f47fb0d205b4a1385 100644 (file)
@@ -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>
index dd6f63af1578b981478c0180f256daa76b9cb09c..60381d6c887b0e5f0b97ae5d3330c067174e71f3 100644 (file)
@@ -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>
index 9a90ac29dd8e803dfa49b8931804159ac38bffbc..64b9a9a56b85b0159791dde1f7e7bd4de7f7786d 100644 (file)
@@ -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>
index 83db09cc301eec9c7d67bfde921d61c37c9fb71d..d47763f24e82eceaba59a45df1f907307840ba26 100644 (file)
@@ -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>
index 7fa7ecd281429094adc23580bedde66b35db6849..999a3a57b9be39779ad98327ce7c3ee9b915cf64 100644 (file)
@@ -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"
index e88bb43653dd09d31b40ebfb77c5e20df89d0ba2..508aa76a228a0bfb320a5786e7c7448166de780e 100644 (file)
@@ -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>
index 985ea0cda4dd75da7b52a720a724f4999564562f..c2c12c61129ef2a3ce4d053d81b782cdc736ecb5 100644 (file)
@@ -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>
index b5344c42642476297179c0273e091abb972fcc28..7cbca5e1c3d2ec94cf1ec33bea310f9d96360587 100644 (file)
@@ -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"
index 660eb59bc00955b92d779a298e69289a97d16b5b..34759335795dfd837c36fa28093c9fac43d038b5 100644 (file)
@@ -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>
index 2f86fd2e2163d1602e34250a5c0db0377ac20651..d9d754d917a69fd384cb19e8667655c3c9524fe1 100644 (file)
@@ -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>
index fc6bafbc64888f9d5f8416c20442f8c9c6b67e93..d5cf73468a3d07e6eaa1dbde59083eb2dbef6652 100644 (file)
@@ -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>
index 5a8913975bec3af987019dbd3f28fd2ea6ea4122..c8e58ca940a6e9389b7e4c823acfc3386d1aaa44 100644 (file)
@@ -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>
index 4f49b88f8a2d32ea66e0045368f9caf6606ae434..e5443adb2fd4ccb24b1ef28d58ff31caac9f8cff 100644 (file)
@@ -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"
index ab1c62d2bef0056d5bca6f97e2160c4df39c4517..c081b6fe023bb55a574d1ad423e4fbb3ce859df0 100644 (file)
@@ -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>
index 669ebf7ff986faa2c4c7368afb291b0e6c0a1daf..7c7933eaad9c69bf0db990e3245854a7922e1b4d 100644 (file)
@@ -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"
index 522bdb332b994f62e27b89ede018de9815cd35b1..6040bc00d1119f63ef5fdd344a3c8bb6a6f84d1f 100644 (file)
@@ -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"
index 490838a8af52c1365ec819417da14c4ef9f3703c..5dadc9d20cce896647f159ba3081b13c70c2fe44 100644 (file)
@@ -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>
index 90299a1c7e2e1617a985713c354900201843c410..597d22ca0b8dd190b053dee65b2a45521b65cd60 100644 (file)
@@ -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>
index ff1385725cdb270c93df9452997fef1457d184e7..ae11d286b467104ecd02ecca81dd282d48fd9b3c 100644 (file)
@@ -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>
index ee7116500c2b19bf57e487ee9b57ef7865d3a885..793454fc8ba6b9d78da3d9fed15c3a7ee362c6a2 100644 (file)
@@ -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>
index 457de318c302cb42b84cd754f6820ad8c4c20b0d..1e21c906583a4ee8891876017224cdb5288ae524 100644 (file)
@@ -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>
index f33fcb510ed959c135df168ce1fb961f8e552bbe..fa0392400b05464fb8af2cc02fb842c7745b9d04 100644 (file)
@@ -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>
index 680aa4716b5a525f9ed2e793918f7ef1f6a21dba..0088b8b8e12b3660d873d0097c8a1ad9fecc26a7 100644 (file)
@@ -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>
index 7625a535ad243d0c2f632f2ac527a4e1c4a7d289..58c607930ffff336457ee1af090c9377c3d0e562 100644 (file)
@@ -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>
index b41dfad9a747dc4cb60fab30e716caf8e0d09e16..94151cd8b0c8bb5f47ac3aa21c85f1527fa79df5 100644 (file)
@@ -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>
index 72e77abdcfeac9ddc9c8c5a4ad73e300ae136a7f..cde088e62e73594c6c9a1d50c6ba630034934e4a 100644 (file)
@@ -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>
index 21955b782f60f883713bed63db39b65e47033dbb..9a5553ebbad523126b19a2d284b62322924031fb 100644 (file)
@@ -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>
index 1348319b70aaea302c1314d555f3a34b287f21a0..0a88c92e0ebdc3a6d4a5210f75d05c2feaf31421 100644 (file)
@@ -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>
index befc365544207f1393fa45e705dbee10d53ae3ca..b5f356a123c2bbdbcc5e00609c1506b02cfec3e6 100644 (file)
@@ -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>
index fe9da36f28a49205d59adf3b5a25d9c79684d3da..6305e83c8ab40467d3da491071fb286c2c3082ea 100644 (file)
@@ -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>
 
index 015fbe6bdfe22075958ede984b4c25a32d97c06f..7b38fff93bdb4761d413e75c29a97e86af613dce 100644 (file)
@@ -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>
index c03e3244fa8e8961195d0a14e89adc15086789a3..c0d7c997a29d62c8d5e624db97d2f6d859399d76 100644 (file)
@@ -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>
index 8add3915d52344c2bf7d52ecf8e3db327d755f4c..cb4317e9f771f9d48dc7b91641d177059cbc9d06 100644 (file)
@@ -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>
index 4f58f9663db81b695d478630675069b5a52fcbee..512fb1c4192e476675f52666c63b457503df74c8 100644 (file)
@@ -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>
index 7bb278be8b83d57b387a42c64d6acd6c188d9c3a..8a44ebaebdf272364af37ffbb3e17a075098ae60 100644 (file)
@@ -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>
index d5d73108125c69142e05b73bf4ab24e709a77260..7749995a60bf663a700f8f0cd0137e0a93fafa1c 100644 (file)
@@ -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>
index a544ca3ccb3ef5176dc80d4c1d5fe1b085473014..0b0d23d56dc2d1dea33c55aaacc1b90923354189 100644 (file)
@@ -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>
index b4bdcc37c7d7b62166615f90a19b73123efb8cc7..56ad938755d4afa5e119c816fba9a2ce010f8ed6 100644 (file)
@@ -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>
index 0f21808711c7b153ea825cd87974e140461c0b79..5f70901a6d8fd714fea6aaac6b00368c14e6a16b 100644 (file)
@@ -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>
index ed2f30f3c50d818d41329e0051e3fa90137e5a94..19929c9b2ceeccc17de13615d2e4970496321596 100644 (file)
@@ -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>
index 7e66b478442a2e986b99fdda4d72dbcd421cf833..ba270e8427b0d6104a8750468a67cb6554c5edd1 100644 (file)
@@ -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>
index 38675b6fb5c786da56b149fcb4442ffe69e3bf00..db09688b9660157d2079cd9f17181df7183415d3 100644 (file)
@@ -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>
index a224d9888011e21ba3077d595af082b0573fba30..c08e786e0a06f6eeeb37cab3588d4568e023c54f 100644 (file)
@@ -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>
index c67b7af089bf2e2acaa05ebd671fcf0168c8c0fb..36ee7bbdefc3c6f12da5de1f757e78a2e5722c92 100644 (file)
@@ -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>
index 8cc3382c7da301017589deb9acb89ea409586c36..e5e34c45fcbebfeff2a7540d27b62fb60d907066 100644 (file)
@@ -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>
index f2549fe6cef4bd81782dcaba6b86f4ae1f707445..ff9b7e6ff958b8f4bef01ca500b64739fd07b0df 100644 (file)
@@ -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>
index e7e7a762a898655d73e24c1a4493866627f0a5a6..8aada83ef1ed147cc644db1472ecab789adebaee 100644 (file)
@@ -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
index 1f69a8e29365b12958eb5cf6e98a180bee6b1243..2e2b3eec42ef024b6df04d71b972bf7e892314a4 100644 (file)
@@ -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>
index 9d6cb4872cd28ea1c0d324e2ef416281f2a84335..8b9a4094eef39fcaf070be2299d8ed55fe9b0c35 100644 (file)
@@ -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>
index 3d321aaeb51bd18156d4d28428bdf9bb24318607..cf52a665a201d54d69d874fa0f35e5c5e099b160 100644 (file)
@@ -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>
index 68569293f2a40db44b17cfb7dcd22cacfc0030fe..70bb9cd9c08a9e665942249750856ee02cdff05c 100644 (file)
@@ -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>
index 1a2af058c647c753b6ab0b3ceb27c76050959f95..192a5e048d4a0c754296cac57eb9afc4035acf94 100644 (file)
@@ -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>
index 275aa3ced2dbbd83324afb3e43a6b14b2da4e655..0c552d90e09d5af4e273554ddceaf514ac9fcb1c 100644 (file)
@@ -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+
index d1b941f4d81c972369aa64a6d6233d0b9681dd83..237f947eb13273b7be1e634f4f7a7545abb4ea03 100644 (file)
@@ -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+
index 31fcf2bfde2c3ab80c0a52132b21c1480e109617..a862891bc67999ced6718833fd3184f0318538c1 100644 (file)
@@ -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>
index 25a87b19de921dee7eca4795f0840c85171f3c2e..b065843f4742b1129f4232fb0fb11b2bbd7de055 100644 (file)
@@ -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"
index fc5d5c3ddbde1a09abbf2fdd8e776b97efbc70c5..dce8551c9fa6e84d95912f47388fd9806641efa1 100644 (file)
@@ -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>
index ff4831b16ec6866ff196090cd35ecb4abdadd8ee..ffbb16568a4bdb608dbe8b3e685bbb43f667a709 100644 (file)
@@ -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>
index 3ef560930c091f26dc874a94892688296fe9b0e8..9933109cb0bc5bccfde4ab92889fd2b2791d00a3 100644 (file)
@@ -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>
index e7f0bf966e7ff2fbbb80c2e2399dfc1c6c963ee9..7097ac1edb355a03e0fd0418572234743ca82fe3 100644 (file)
@@ -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>
index 6e9002c8fbeb54d10200384c89861edfb9cb61f6..ba020dad7ad1e599be0ea592ee64066cc47dd627 100644 (file)
@@ -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>
index 8a8343d1293380079b9e8071a46f21d791b16ad7..ea8755bc1a1147b4d9492d34470c56b078084494 100644 (file)
@@ -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>
index 2e62122cdd341cd5de48476290dffd69bbd92867..afa30b8de5f6b8edd6307f2651dc44e40cca5829 100644 (file)
@@ -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>
index b25b31d00745fd92989622dc79094cbca591e26f..9261524c6ee26fdcc2eadd107c4c7b9422e88e9a 100644 (file)
@@ -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>
index dd887542f1989fd00594e3cdfcc9ef3ae6e33c8e..cce1500af79223594a002e4d3adaf308f88cecb6 100644 (file)
@@ -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>
index 1ddecca4c79e279fc3c47197188fa7524535b4be..335d191f9fa2f3f484c787c84c559d6daddaf7e1 100644 (file)
@@ -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>
index 1a99a875d0d66f412956a02aa302437403a2993f..559e5e5e583f4633c1be43101d5dfbf0a456658a 100644 (file)
@@ -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>
index 61a82c2f66dceabb6268ba607f0c7442898e6c7b..09104a6543cf30fd78212dd4d5002e79b79ac901 100644 (file)
@@ -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>
index acf4fe56f110eb8190d74a47caa73d740797f741..b8a7c0c32a24f44316ed863088572a4525b1770c 100644 (file)
@@ -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>
 
index 93ccb192b07509dca551e4a1af1a32981f6dd76c..32c438ce638ad72b98f298037fa3c8f5074b10cd 100644 (file)
@@ -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>
index 2541bf90e9ffd95968d3c6c9411c731b865355f2..fea65dbd9d1c2a025046d196a55cf3754f7a9993 100644 (file)
@@ -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>
index 5f96dae9be186ef52aa85300c0c2df0bff8f4c76..877bc14bdcb82213205c2d85b7d390372c8e0e4a 100644 (file)
@@ -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>
index a99d87811fb51bac24035770964459355032137b..04ac36ed792882acd2a7967e32183b6584166ab2 100644 (file)
@@ -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>
index 5da46a95503eb5143032f1d5addd5c9a4d9cfa50..99a2d00dcd915121b08666ec23a495ba094bd005 100644 (file)
@@ -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>
index e701284e85f47dd09a25b9526c8fd35ae8dacea4..588c17c5452dcae571bbbbc31779d52ad316224a 100644 (file)
@@ -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>
index a4b91cdd8b10145c6f588e2a0974c0b1799a2ec5..6e381c2dd8b881eb91f0958ee4518065364e6101 100644 (file)
@@ -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>
index 8e5643415211fa1d8b59b0db4b8fe914c1fd5969..cf758e4313c0d66f38b8dc1beff680ec0f49b79a 100644 (file)
@@ -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>
index bcd874af04c41833620e98ef38e527b33753c5ae..e6854fa50057a133037c12d0a226fd9b3759060e 100644 (file)
@@ -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>
index ddf464a166250321ae93857affa6834c1477e6e2..cae886abc4ef6e6dffd48428dc12475a6f706c42 100644 (file)
@@ -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>
index faffccfe15e14afcd4300326c27ed40cf5f9e69a..2e14ff4a60915759245ede92f51df644029910b5 100644 (file)
@@ -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>
index f0efaadf4a97623fda94f10c2e22e4a16ed61a53..c5c94be103dd0e8d7982e3fedadf5b62e3ea697f 100644 (file)
@@ -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>
index e699be522ddb92458d618120d24e2616642506ba..344b7e2722d33691afbdd9ea37027d5eee70ca1f 100644 (file)
@@ -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>
index c012c3b89abaddbaa38a1f2bdbce144b98e5e88b..4770a0781b853d991bffcee590418e57d8a47cc9 100644 (file)
@@ -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>
index 8cc342786ee6efede1acedec6d69d8e515386f86..166061d89af3a563ec86e145f89332039f0e3a2e 100644 (file)
@@ -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>
index bba96bb2b9b3b8bcfd0a743bd301465810af55a1..5b681a5c0899e62007710a7cf049469d0422b5aa 100644 (file)
@@ -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>
index c7eb47683b7bd172407680ddcc468ed6facd6e73..eba909af4b4c595a551211675c5ccd1fcb115601 100644 (file)
@@ -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>
index 5a18291afb87588e5f4506108abb2b438edf118e..b4426213f9e685ce4179318b9bf75b9edbb93553 100644 (file)
@@ -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>
index 283822e9e391ee8ed335c1b5829ac0abbca04d9c..e63625b502996a0b3c7e98321b4e99992fdeb737 100644 (file)
@@ -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>
index 551691e2c5dce9764b7168680e41895d994367aa..aa46b7f8b07b8dda5c2bd089071ea75c0e922f92 100644 (file)
@@ -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);
index 450b039ed8338007f41a16b0deb7c59a3319cffe..2933c4e455683f729020ed13610c5bff08ad8290 100644 (file)
@@ -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>
index f60809319fb8b64681e8a82b5c24f9f3f97d9e15..17d02a79c5f21bbd3f9580cd8f5b580999937e9b 100644 (file)
@@ -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>
index 6173858c0c112dafaf7289c58d1dcae77805b071..c6bb4b85c368099490453db41d49704b1937bbeb 100644 (file)
@@ -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>
index b06362a7bcd6833091b0a9030dbee507ced0e4c3..420e8895d763abb52665b52adaebde78a3c566ae 100644 (file)
@@ -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>
index 2e5042a5bc8c3e1e24041977fc8ba1dd50eff670..63ed5ebe1fad8620964172e71167661be9106983 100644 (file)
@@ -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>
index 0b6478e90e1530eeb10cb0e84571886c1dcb9869..ed9ebd715200e908591218d5b6f0696783119a4c 100644 (file)
@@ -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>
index 3f7596d0eef357833e9924fcfaf80dfd291d5d41..c500620b4033e39aefde5a3d200ef3eabc11f380 100644 (file)
@@ -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>
index 2f1c52db9a452f2599b72a129f34bb6e2a45782d..760448d02af66dac15d562385ab90b01bc89dfd2 100644 (file)
@@ -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>
index 9da2d07416e5e8de09add15c638e52a1b5051d0c..15be6c2a606c3207bd44c107c0f37871f857c820 100644 (file)
@@ -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>
index 2db32deb143948899b1b8a849e18f38e3902c4e8..fcfb1cc431bf456b039efc5d1a836e00a4e2470e 100644 (file)
@@ -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>
index b383d196d1ce902f1a226027a2ffef7bc7d998ec..3ab24a58e82208358510f9be1f9c285c2d95bbf4 100644 (file)
@@ -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>
index 3a413a20b42a02b121faa8ec9f298ea52cdc99fc..d722c92083cd5a9fc86d15bfda0724252e70c226 100644 (file)
@@ -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>
index 5b35a75fa924a30536475a1427553da478159fa6..f40d6713ece86b3f36bed5be0555f784bbf247d8 100644 (file)
@@ -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>
index 33b53656010ef3491a11169cf462c84440729787..4083b0f4de5cd96408c5e71b965c3ba7f018043f 100644 (file)
@@ -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>
index b4ded41b4aecf1a6b70d5c1d9502d5a27c20bf08..2afdb07d3960a48c58522658cc7e4c1e948ccff8 100644 (file)
@@ -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>
index 59009aaeb05f44d8c42622c1b37c397573f23617..142ce7fdcaa2acfb07a0c0058e898c590b18a8ee 100644 (file)
@@ -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>
index 62f7c34484941d0f5daffdecf93324bc6c0200f4..c6b832a8cd92b90588b415857c28ebcb95a1f491 100644 (file)
@@ -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>
index 95941379f4aff7e76ab7f376cfafa847655a6624..defc5baf7d29bab5d456452a3ec996997f6ed06b 100644 (file)
@@ -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>
index fb24458a9ae778a53075f2196232803fe21d56ec..8570a4a7e468621103cb0055d2dfa1db08033c44 100644 (file)
@@ -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>
index 7b70a0b7a201a07fae3b7226a1431d2db017364a..ced87fcea09bf8898937708fc2bc6478fe7a7378 100644 (file)
@@ -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>
index d4603bf59417e4b33996b72cebbd3cddb5530f94..bf531dddcf971ec8349700c80adcb4bb7d43457a 100644 (file)
@@ -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>
index 7bf43b44c94d6ee5a4ae05c2d020ad80ce20b88f..4015f2cfeab8790b6edbd7406787ac6d2893c706 100644 (file)
@@ -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>
index 387ce09d6f7295466d3f6ce3a13e477fe18c8705..ce6e87ab58550f8691f976177a78bff62488290e 100644 (file)
@@ -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>
index 1f647efe70918a99f0996a849d32a0ad56a3bbdb..683df1c29805ce4d6e14426788cffeda216401ee 100644 (file)
@@ -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>
index 8bfd9d5279f9e9df9cd81b41517733a3fa6b0811..120b5d5d92094a35a8e0be4ea42f2de159fec697 100644 (file)
@@ -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>
index 0f67ab4a6ab0dc98764ded05d5490b4ea562f5a0..5d6fe672f7d26ceed345e091cfa782c1d41e583d 100644 (file)
@@ -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>
index ba0ef94c41a5d73745a02f577fb5183eeb14deea..1b835481971d451c2ef8d9fba439a0a954d1595b 100644 (file)
@@ -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>
index 364cfa852bae23d4a5071b326142ba708343021a..bcd44f5202b69df18c70411ea3d3540f372102a8 100644 (file)
@@ -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>
index 99d438fdd6b41f47a119a5bafc5a18ae0b232b7f..58c1994e7f329d9c48405e596d8a53bf4eca92bf 100644 (file)
@@ -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>
index 2e049663a57c60651d4f40dc6f7af6b76facb94f..abee2456ca0964a496ebf3169fd2ffdd8e46b800 100644 (file)
@@ -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>
index 20717f4ecd392365a15648e0d3b3c16487050bf8..3f33c87bfbc7ad8d26ff9bc478961d785634111c 100644 (file)
@@ -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>
index 043c7a2908559130dd575881502b0721806d31ac..f61038ec15986d564c9e302c8dd6fc0e969a9fda 100644 (file)
@@ -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"
index 5907190b1a866898a57195d80dde45cea5f3cc1b..f8a6adac56d85673657b5623f97066ca09628ad5 100644 (file)
@@ -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
index 4cb5834b74044714babdfd5ca272d5cd59617ff5..1f05526d79b31fc85a2b6207aebf772e6a39ec60 100644 (file)
@@ -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
index ade00b25eb740d921b42589c27ce639942fdb1eb..e5da0413dbab7060f4355ba0f885fd2f75ba3cc3 100644 (file)
@@ -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>
index bf034df06b6b8548d3ef0aac05d3ba4b3ef66de0..53c5dc5f7c68a68fac9df96d61a4f83971a9e18c 100644 (file)
@@ -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>
index ee6717f3fc5297a69d2c94d35015ad17291e2752..3d014c91c2efd5ee8315a691a90be772e56bada9 100644 (file)
@@ -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>
index c8bb548a7744b093637c908334a18ed9b55ef2e6..98bca67e1ee04b0229203de1e86b0c1d73a00b5f 100644 (file)
@@ -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"
index 91debfcbb2b28b6c4ad82cd602344ec52db770eb..f322b7479405882c885ad531f70b9e723bf9cc1d 100644 (file)
@@ -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>
index 5ff4e4d53b6bc85cc5d04f64992b6718786b68c0..ed020c1ac8784cabdaccac0e39db51012ee67fb3 100644 (file)
@@ -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>
index 61be718498a96f99594519c3630478bae347aee9..e0334d31be1f2ad0975e774b5dc2fc5c92113631 100644 (file)
@@ -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>
index 8d174da7cb4db2fc08956c3929e8eefc2160357a..a5f5cf84ddc5291b2db65888630138217c147b6b 100644 (file)
@@ -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>
index b55ab970c8da42b8be73bff3d4be0d1f0b0f2171..e5ec82f7677ab2163b4553c25dc3f6598608070b 100644 (file)
@@ -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>
index 8bc9d46b9f1dee4a7081fc2a69531b2207e4ff76..14c57804447125401335aa308775491d9737b779 100644 (file)
@@ -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>
index e8520d03c8773ce18cf7e4dafe8054131849dde2..aaf19c2bf13a9c1e0b3ef9dcb47bcfba9e4639d1 100644 (file)
@@ -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>
index 57f0631e723fbd3ccc9791a5f04a84dbf39c3498..f626c5e2c6d5055108c63d8839bf8ce33a730706 100644 (file)
@@ -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>
index eb4102978a856df46db753304e96df0034327eca..6dbb4f3ed6a979729281cd34618143504d330ca6 100644 (file)
@@ -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>
index 86e8a527875cd033140001297629b8dca47ce925..0bcdf1841461b49ba8dc143833f688d703e368ba 100644 (file)
@@ -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>
index 5bef9e27a7f7426fea929ec4a6cad271ed0f67c2..96a42298798d198c198b2af8be4b8f8d7d97f003 100644 (file)
@@ -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>
index 3e2dce759178a8aa3f07c8b20a73b4125ae9e710..b150aab643982db41386c2072c4d607c2c5f349a 100644 (file)
@@ -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>
index f0f5cd107dd30b36a403fc4f4237220bff689252..9dfe24cc6682a7471ce06f80b214ccbc8e920393 100644 (file)
@@ -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:
 
index ad09334fa4318e0b6dacc78a3b3bd6219c0beecf..8f02bb5f2750d3ea5529d839815c2c3d8a6f690c 100644 (file)
@@ -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>
index 27d6d8e1610481a43d905b96a194194e645b4e7d..53a3b232a67b9dc900a51c82ff3104db416845cc 100644 (file)
@@ -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>
index 361ccb858ae87aa9feed1760553173ef9365b8e0..367a7519492c809234bf5854f1875db8467d5f95 100644 (file)
@@ -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>
index cd9cb99f2f8fbf2b01c9072ef2046d2a4b8ac243..4f15fdf2df6a6b299770d6444c71818879a78291 100644 (file)
@@ -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>
index b4ee0da99cda3de38e0bbbc6f52aeb84de26d0c2..18b547768a01de0aeeb8f9f31346ad0c5dec234e 100644 (file)
@@ -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>
index 294a5eff564690644ba546f7f3481df7ecd678e1..d0a3e42ffbc41efbee581c08a9400ea4932435c5 100644 (file)
@@ -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>
index 023969c3f7436af59d70b5e30cab6977badda085..1b9a87dc17198f4d10babaa21f1213b14c0c445e 100644 (file)
@@ -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>
index 06d28bcc77768fa5c2c5125df023eb816802ca93..751981b1cae47952822c3c4056d78021b3765ddc 100644 (file)
@@ -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>
index ec8c0206836f05937fee6a3e083049d27bb0b84b..8cbbfcc1e258a739d7bfc0f39c2d01014008eda6 100644 (file)
@@ -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>
index 38786ad5460b55cf8476d91cd671dbebfa5e932d..9738eec832d378abea7aa0a8311d9d3207cca3c4 100644 (file)
@@ -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>
index 4aaa7938c26966945bd9cda219088c109d00b577..3a2ba00a1dba5426d980b2cd954d1f29d1d462aa 100644 (file)
@@ -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>
index bfd71dc1826c2ed1f8ae93a269ff31340f183f56..a09fe7eb76fecc6f18ea946e22087a578a4a3aca 100644 (file)
@@ -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>
index e56209bb678c44ef0ce921a9db9dd6373886f8fe..a9672e241c2699bb65648cc83216de825638d307 100644 (file)
@@ -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>
index eed44e9efba5fe0c22ba8c190f2ad787bacfad5d..608127f2990fae1a93624b57417a752c4182df94 100644 (file)
@@ -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>
index c0f2ade66205711b6f0b9eaf8100c895593b16bd..d564b73e596c80e1f1756485640dbb79d8877e86 100644 (file)
@@ -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>
index 6bb66c1150eb1cecbcdea17868ca6986317aea7c..9b0135906174605afe951e066a69bb3ff1ec45a9 100644 (file)
@@ -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>
index f774d31db615bf5d93a60bb437051ab1e01e019c..70f78684c1f6ad917a41e212892babd5051a7627 100644 (file)
@@ -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>
index f7a5c8b243764c2a17746d5f61b7fea9ac66ef03..3bb0ff7248461b07881c5c9707e3fb1c9ebd49c4 100644 (file)
@@ -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>
index 93b26ea711c71eade8e2bcf50f0385f0684087e8..d6944e23445f70aeedbec85cb93d0b104041c757 100644 (file)
@@ -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>
index 77351fb795ee12c599b3ee7b99cd1dea478cd9c9..e6aa9dd37cc8b82eba4e234d7d05ed7668c4610d 100644 (file)
@@ -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>
index 793b5d52e48ff3456628c5c77630f89f263a2b39..2f0b3f4a30db597660944b7b036cbe0195b3dca3 100644 (file)
@@ -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>
index 957a1447675a7982f6885e359ca515f6276ed41a..3cd07212872664462df2afe1d38a72a0117c2c1e 100644 (file)
@@ -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>
index 6cbdc4cd7bf5877a0e977e0536117c477bc6f111..548d488faae624f0dbfea2582593bdcc81934fcd 100644 (file)
@@ -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>
index 7281cd6ad4b4ae3ce64fa823d4105500d9b80e09..3494cd8d9ea89e246f4ca1db832faf737098b8a9 100644 (file)
@@ -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>
index 0c2bbeb422398ee39b22386d0d6fa8eafb1fa8e8..207ec76c8ad15996ef82b25f1c10df0cdaca61ce 100644 (file)
@@ -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>
index e5c62fe188cdc914a1da7554b68a346b55f065c1..384bdbe6eaddda98890c1ec01828bf690246050c 100644 (file)
@@ -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>
index 9fdd2fecbf7243b1534336a5543c3a018df1eda8..78029dd249b8d428fc09215e87e5fa64e864c245 100644 (file)
@@ -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>
index c7f28d1affe242f6b85f7552452bf45447882acb..3e6ab5f93b56838eae6fd5352df1d317a4d02756 100644 (file)
@@ -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>
index 4944edd81f40d036cc93d08d106e05891bae2ef1..9f63b74a4ddc74525fe85e882d0ca5b018bb7bae 100644 (file)
@@ -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>
index ce699440214759e88b7e2ae3d6abebc8849bd57b..35e3aa701ecd948aaa73cc99e8fb62c587f16023 100644 (file)
@@ -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>
index af6682b8ea02d431116bd1f18dddecb00e01b030..7ea324c9e4ea0c84dedbdfd555cabf4316e0ad71 100644 (file)
@@ -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>
index ab95d08a1b38a6f511642bc1b810891141d5b72f..f830253cf4c8dc9d5dfcc82de9417692ba041a66 100644 (file)
@@ -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>
index 4e01c3033763c76737c2942ee5b583dd330416ee..9929b41a7549834a1af32c8a9a702780a869cc91 100644 (file)
@@ -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>
index ee1f13560a563e06ed8ef2650a639fa0d10ca17a..a519d3df4c98e47ba2ffb9a8ca2090c9d2fd5794 100644 (file)
@@ -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>
index e135c5af89e581c82c7fc57a6786ae9541138472..4fbab87962d4047daa4d2159693823d305a66b6d 100644 (file)
@@ -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>
index 9cd57034041bfbfb92d3907f469c64c3cf5984f9..e29712d21f12d034127f231c021d46faf898e5b7 100644 (file)
@@ -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>
index b14330ad87f483a94868086255718d07d3efe036..a5a7c8d795c73d8377dfc6128efe4f15360c0378 100644 (file)
@@ -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>
index 78843d4bc689e64e0f2811dcbaab1d6c2a2b0d7f..78e602f0e9abe449f7e8912adf7f8ef05014362c 100644 (file)
@@ -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>
index 6772edc4678339268aa432534c5c28444a2514a5..80630785621bb46736b9e176bc129783ed10ff97 100644 (file)
@@ -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>
index 4a6a8b589e60da3aca611dff7324d1eb59b5054a..a308ea45d7738cd22300ae0ce2551d6ab4a07ad3 100644 (file)
@@ -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>
index e58ebd18b51a42f3ed1a40c525ea2fce3e8283d2..a6ccbb777dcb2e57c7f9f32d1526edc423518cbb 100644 (file)
@@ -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>
index 6fa132497e0ed3f1581257af5db479d6d8788551..56c5a447e9c3e702f6d48ad830aa5b191ae5908f 100644 (file)
@@ -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>
index d30065e744313f5132f4b6fb3e54fd46ab1c5078..f3e46881d5952ad6752a10ef7d4f57094e710b0e 100644 (file)
@@ -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>
index b83230aa98462b18edee43d581429cd598cba520..494506559c3ba20d5035aa2ddd0349e98a75fd8e 100644 (file)
@@ -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>
index 122ae5b3d0f4353e99b52615f3a01a6f2902b1ec..cfa61c9c64427cf423a3aea1015b0455e06bbdc2 100644 (file)
@@ -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>
index 9cee3bb27113e2633b9555ae738005ee15558c37..137ee2a9762d21486e6c058f200675fa9f7a00eb 100644 (file)
@@ -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"
index c93e8524c228b58dd10eb83c546cfaca080c15eb..35d65bdd5dc011f91b39e0005cd62c0281f9e029 100644 (file)
@@ -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>
index 171ee31e01e009263e1cfffa570dbc0c1b032e18..a340bba089075f942da85a9638dbbfbad4887a45 100644 (file)
@@ -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>
index 18cdad10f88bc5d47701ca3f50b4aca3b264adc8..2a4a4ffc6839f6f84edd8bbb9f687263c4df7f3a 100644 (file)
@@ -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"
index dcf851d5f01d226cd1fea71737190024170ea148..9d2db6b888712c1fbc0c4c8aabf696300bf8797f 100644 (file)
@@ -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>
index 6972de7b9728580117d0a5fd3ad91a2a04532ad7..8c27a42208a7aa305069c09c088eab6193168028 100644 (file)
@@ -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>
index afc3961b39303a36bb8b0e3f145db1cb3c9d5616..cbf7e3a663ca2e0adabc079e0aea9c8da9a6075b 100644 (file)
@@ -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>
index 352c0aaa24086264ca4210b0738aeae2657ea9d4..e8ad5586422f94c63705cc76af6593dd374a6c03 100644 (file)
@@ -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>
index 7e21682ecdf34f7ef17095f4cbe8fe4784c66d8b..8e22b20dd072357522c7f0b2a98e433dba9c26ce 100644 (file)
@@ -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
index 6c5432bdbfcfea1fc5019650b87aaf90e84ca99d..08d7aacaabc01d989e650a17b5bb3348a326c815 100644 (file)
@@ -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>
index b30242b2cfedfc05cde1aba90eca814a697f519d..457619aa6e5b1922488cd744aab8be3f964d8509 100644 (file)
@@ -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>
index dbbe9047c2919d44aeb8f775b3502727b9802dc7..08be4ea68d37af8be024ca2105ac0ac025c82e68 100644 (file)
@@ -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>
index 0caf48a7ff3584e1266b134e8c69388d35e4e254..7961af8b04536eaa2fef43b3efbbd77db35ba78e 100644 (file)
@@ -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>
index 07299c235a88cd10ffbd7ef54785f2d21ce24027..d06d4c6f25c121664e380e2b0dabf14baf019bfc 100644 (file)
@@ -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>
index 6103558a31e909834516669bdd6303ab903de8d6..10073c5ebd1b7c672d19de83b3cf578b96eb41dc 100644 (file)
@@ -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>
index b95980df584764356116575cb35716771b9dec14..38cf6db0bc597d2837dca8c88b9f6fba2994588c 100644 (file)
@@ -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>
index a40b1457e141d998a2a99a915efb742a3ac3f3cc..887b3da8703937db95ea763617cb2f722193e765 100644 (file)
@@ -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>
index 2b89142d2cf7406e60ca2bbf06d6fb575ea953ba..85e8f7ad4398054e02dca3380870790c98337161 100644 (file)
@@ -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>
index cedabfdb79b4c8d29c7f35087b32e91b8f39a323..3a03703afe79c8a6eb707ef52d29f85fe978a381 100644 (file)
@@ -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>
index 85336ba8030f7d1a04791925ffb84039330af61f..426587560efd01e8504c2ea101b3c87a8b4ffff2 100644 (file)
@@ -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>
index c057822221cbce808da28df2e71cc62fa62fd84e..8dde54b9f7253576a3160654591331d64dd1025d 100644 (file)
@@ -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>
index 619233db1c65dbb2e51afa20cb138503050228c9..4cb5bcdc79cac1661cbddea90c29d754b10739c0 100644 (file)
@@ -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>
index 22486ab7791930e3fd06bdb3cca5cf8e9fa0a032..87cd4ff34de449bf56651c8c75f6510eeb945508 100644 (file)
@@ -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>
index 2e0e7e3067e713636f6a3628946929ab540384e1..7f8d9910ab492e4b0fccee7a3e4648084cd4aca7 100644 (file)
@@ -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>
index 8d5e1058d89de33051bc84b5111b3b7bd32297dd..eefdfa7cff238ae49d62a81a7cc1d2559178d3aa 100644 (file)
@@ -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>
index 69aa94c53a0964c7ba856add5f5537f92b4001be..6d683d58d43745fbadaef43c64d5ff987ed3c99b 100644 (file)
@@ -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>
index 495549d4987ad1925e564ca681ca9b78d9a566d0..d322c5e370f08d1ef8eac1b409f78bee1eb97bfd 100644 (file)
@@ -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>
index 28c89ee9c123b97a7840f592b98482c7951c186f..fd3529315c6097a3cc58e956b64c995d16b9d7c6 100644 (file)
@@ -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>
index 6eaaaa83d624e3753ef074e9dcf10add2e677813..041b0663d583013e2affb4e9fa3517c00de8d270 100644 (file)
@@ -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>
index e6e63f7c1dfafcfe82116a2ddeaa904cbb59a765..6584aec9aed31152ea5479d0e16037a0f610776b 100644 (file)
@@ -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>
index b78ed8c760056c396083971abaa88539437cd520..a5d4d5702cd15b00d8604dfd81ac138f327f2a02 100644 (file)
@@ -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>
index 829156e6df027f896892aa434ae6f44980e04a75..a907d1e5d0e1a7a54c8467ecf0e27fca9e929b7d 100644 (file)
@@ -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>
index 92b4a2b98fbf1394dc7bbffb65d900c14be45197..56b68b2ad4907dd01a0727e34ca2811f7b703694 100644 (file)
@@ -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>
index cc92e1a8bc9a76fb5b3cdf2aa6eaed5d27513732..552c978baa9321ffebd46f7d982a3d4e0cd5d27c 100644 (file)
@@ -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>
index 2774004ff1f3b4a92fe5b8552123d9a3f1d24c1f..11ad6f1faa5146167d8995d155a6b480eccf4a50 100644 (file)
@@ -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>
index 63c02d336a7d5660c31457ef286b849bfb7aeef9..1b1bdad0697ebe7ee996cf5a28644f5aa6ac3693 100644 (file)
@@ -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>
index e34892358ef2a57004d711d72bbd583c1c6dcf0c..6af957a9c2a70895e313d358c0ce72dda68825ef 100644 (file)
@@ -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>
index ccc26a90f68b8a4fb3e279588d4e086016ea5590..cb26add2d08bb54e21061a2bda132115e494e5fe 100644 (file)
@@ -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"
index 9f2edfdbd23d6d197c75320e3c671c390959895c..7531138fc03d22232dddd3d668b12b2e6fb608e4 100644 (file)
@@ -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>
index 438748230da15fded8237f0d5e4902c27a7dff27..af8761cdd97b240e418658a592197345cecb2620 100644 (file)
@@ -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:
index 6a6c6cebf887b3fdf0900d32d597b393ddc62219..e085f9487b4e16fcdb661afbe018e76749d2a2d7 100644 (file)
@@ -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>
index 2652cfda830305d22202d9918c2be29031b287d1..59008b60474e1fc90fce78134a30dc71978838f9 100644 (file)
@@ -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>
index 8c6947bb7bf5a95be728ef5f48f106d420d3af79..174af0df269e511cea081af6f91299e005dd53ab 100644 (file)
@@ -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>
index 07574faf9d511226178700cfed874edabb3f112b..d7f2fe4eb9f9daaad30bc254c515d7d18c9a2cd2 100644 (file)
@@ -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>
index aa833b2bae18d8747f7ef71493561bcbca4fcbe7..bae16089c8601dbf8590df19015c53e989d0698b 100644 (file)
@@ -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>
index 6ee7834e5267a029e511410fe75ea626eb9bf8fa..b2f21080955e5e14bae0ddbcbadfcbaac7569b58 100644 (file)
@@ -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>
index 0c72048aa8cec639ac430a8b858abbccc1ead97c..8ce74a43d90a2b1ca3e918f10e23be715845bc14 100644 (file)
@@ -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>
index b1c73bc860e08ac32fbe32f7f822ae6756b0aa54..3670c6b8394ca602b3504ef407117c3782fde664 100644 (file)
@@ -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>
index fb5b658859919f2e7c3b35340e09a26895e20967..b2b343c093b86bdbb6b656435e3997a859096563 100644 (file)
@@ -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"
index d0bd6de716f70b10335ad417d3d1fecf4278e91b..9ed57546abd4cd61793127e2ef9570fce0d12eb9 100644 (file)
@@ -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>
index 65a91d7c98482c1746a4b83348c3845ea658e8b7..a02827165413030592cb1a883a96d5808a84b102 100644 (file)
@@ -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>
index 519879cafb2353eb6cd18fcfe2dd88001d9e2d88..96d7a03fd54f8298792ed66c0ac45c23cec6d58f 100644 (file)
@@ -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>
index 61b89e0c86a4d1c1b6bd82e9cd4fab1ef4d3b023..105bc3506be5a7a3864342d760fb6cc62c0df6be 100644 (file)
@@ -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>
 
index 3a7cd40196e904b2a33381e5797dd1223020b272..a4aac236a2bc443579efd962809c76d1ea4e9ec1 100644 (file)
@@ -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>
index 25a0c5f2fee8e386d9c2d3b5af9489714cdc7f33..5e95a25c99d12defaedca838452d84ea22082abd 100644 (file)
@@ -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>
index 02ad607d98f053c7402d12ccfe0d392a8c66abfe..faf40578e7a18a03e470190b6244fb7fbf9a3ea5 100644 (file)
@@ -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>
index 98a3d8c58a1e73a39a2be9fa723964ffffb5cde9..6c3f088d906946902c82d21a8301f2194ab5b826 100644 (file)
@@ -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>
index a0392bcc4b76dd594b019113ec53268225fcdb44..c6843396b86e155b37e18a80ad4efb15a6b60540 100644 (file)
@@ -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>
index a6381f7ac33b1f92a66cc0dfdfb79a098310303f..5eab0ed4157d6b42e2e8420d99ffd5e34b7c2d20 100644 (file)
@@ -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>
index 1d60662b7c41b2eb90f020500ff240ec0cd44d90..6ed290e9299637546261f2380d68f3049823c70b 100644 (file)
@@ -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>
index 0b72b46cf3d2ccfce0d369c35bf612c9d4af5a44..a17464a5462633bb41da84356187800bac3a8cca 100644 (file)
@@ -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"
index 41abf308e3e2ddcb801b1bb970007b621e7d660f..03e5e7de48f9c2b48591536ec10ce222a8a94890 100644 (file)
@@ -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>
index 62f665fcdcd3767f8ae41f6bbbab69406a097fe7..31dafe748dfe9407afcd56476f73a9ad6be29fc5 100644 (file)
@@ -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
index 4a7bebf666201c78a0881ac050aec59174656928..38a17fcfc371db13f65eba3a4afffb7dd5029ab5 100644 (file)
@@ -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>
index 8dc19d92e2482a302067367bfcddd7e6fc402576..eacd0a402907c1985356f5904823cf336bf9cea8 100644 (file)
@@ -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>
index 4cb5a903c5704dd58f15719442cc6c58702a628f..af1214817ac2c19dff0276b40966477566c23366 100644 (file)
@@ -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>
index ea5658a072b9d1c37a1c25f3ac2ffc7c380d54f0..3ef0b850f4b145788f1e9b29f93d6797f67b7670 100644 (file)
@@ -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>
index 09a2ebc236e434085bd527a97b308807cba3b14b..76c0626c6c4215e6e93be6b379c727f8757d8107 100644 (file)
@@ -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>
index a69d583db82c5bd3ed8c6dc264270559c6e31431..bcbfa277823b046d5ef3895181d7cc400128dd5f 100644 (file)
@@ -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>
index 825cd197a62cb92a5461e2e2af38940e92d0c6dc..9717202f12605ed6375fb305a015e6977ee7b6c4 100644 (file)
@@ -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>
index bdb68fad2f48ced5bb2f5892e9e96b7445ed6729..50a9484115db37e02c1d1e2477f24e49fe1f710e 100644 (file)
@@ -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>
index 7c7c4e04715c0afde379458084053285cd2be4d2..7fcea82a30b15da6a772385979dc7f3bf2626bb4 100644 (file)
@@ -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>
index 1cdd92579e64aef0fadb0ccba12523614355072e..80aa1dde65abcfa2c181d7bfcc5336d168c1753e 100644 (file)
@@ -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>
index 23a6acbedc46147711c5993f25d52cb43955b91f..32ac475c6df9e402053237a5eec63a63f2adf47b 100644 (file)
@@ -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>
index 24d4c734db71282e56d23928b55878542aef682f..c875b3b354cef63cfb5872536c7a11ae99dc93c9 100644 (file)
@@ -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>
index f99b9e6ae2cc1ed5cc62b8c6954f786c45743986..ee637cb4644e4f5940dffce4941dca7c0d42515e 100644 (file)
@@ -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>
index da5a5a157a8aeb88be9eab96f122d57dc69c85db..5d00f5c3d356bdebd9f6f664cf5a7db917f76e8b 100644 (file)
@@ -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>
index c790e41f78d7353584a7996311e9238912d99a65..484beb6cf345006a00179af4cd9ba683d2f06893 100644 (file)
@@ -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>
index 9b5895b5c7acc0148bddcff8ac66c3f8e798534d..8beb6a7dac11a0cd3bb0b06353cfcd113f793311 100644 (file)
@@ -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>
index 201332ca09abec876deaa014fb91cbd3cb8fce0c..3d6bbf72818087e819502b344008a285f81e2130 100644 (file)
@@ -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>
index c2eefd5200be09f972998c661dbadbd96fe2df83..a80d1dd1d75a6ec1d07d8bb254ff5f08b84d1c9f 100644 (file)
@@ -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>
index f6f1db2d79455c46b0741874619f66be1188155b..a54e4e2ab3fea32fa24346a58df82469b7843d7c 100644 (file)
@@ -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>
index 03b6a40f4634cfd7aac1b78f17a4641e721a8bc2..61b861e813945ab276b651c2194ad248add11f0e 100644 (file)
@@ -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>
index b2724957d423d894358c21b238645e1999b26501..64b4cbcc7243f604d306a94ef1350bb258ba3cf3 100644 (file)
@@ -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>
index 9e90a39f582fd5e0334dc16374bb03cdad4fd8ef..84a39162585f5ba3c8a0ced16d36b71933dc6f92 100644 (file)
@@ -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>
index c91c6fe023fb41660009a01026a7747236acb7e6..95fe8ba08ea014f0f5960998fe6afef12652a309 100644 (file)
@@ -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>
index 21fd04768ba9d1bd56bee7192ca605df43bd4e48..67e74cabf779b1a7154394b3de2cc06b6aaae5b6 100644 (file)
@@ -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>
index 388e0ea33b8f00e5a86d72788360bbb91cb78fd5..cbb98f949170df10f05a702b30c6eeafb1b92a75 100644 (file)
@@ -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>
index c235e08bb2ff507e5a217abc64b3adb26444175d..6f11b65c955735b4205336972925432de12831cc 100644 (file)
@@ -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>
index ebcef84fff21d4bac11e137407a8367096119e1e..fe8a33e6991da5c91ca373ba81f2bc07ae7f1293 100644 (file)
@@ -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>
index 0ec9d65e7b7a1aeef2efb761fae8452cf9094da1..3d8771e58d42fb586e7fc5a6994d419ea1708312 100644 (file)
@@ -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>
index aab3703f6a0fe142660b92863ba0b4b35213f08f..4b15d0f8b8ff5e54a698fb9c2bb0c5f0c9fedae7 100644 (file)
@@ -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>
index 51efed3d7c86c2d8f11d1d86ffbfc298525a726e..99ef6e8afc8200e91598cb82a8b8c9fc2064179b 100644 (file)
@@ -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>
index f9672868e39a485caf12faf2d413addcf01c6902..026eb0772db16984351c5bb87d095ea859a373ce 100644 (file)
@@ -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>
index fc71e2db9b9deae2fada7e8b7e64207107e14c28..fc65fa581e1714b12f3f4ff2218e2dd02b6240d0 100644 (file)
@@ -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>
index 0d02daf114972225d30d4cd561df814fca99b7e3..7a58232303a1283006d5fb2c159bcc96c1f831fb 100644 (file)
@@ -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>
index bd955867955fd7de6cab25ee7f743f3d2b6f217f..2cf4f40bc6d17257594f8089ef5b796ebdcdd73f 100644 (file)
@@ -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>
index 82814fe83a52b135722140dfdbeb36cf89544678..c6a108720b715803217eda34968375a3e219103d 100644 (file)
@@ -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>
index 24e3eb2b9e4d32286e0a2a8645603c41794d7f44..d45ff14766c2c2b5e50c3a7a773d325d8a13c131 100644 (file)
@@ -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>
index 49ae30fa297c8d6701c99d2e1f759c4176a79766..54e26903ad4e0c8ffbead7da0c1b0f92a4137f78 100644 (file)
@@ -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>
index 6ffdf2f9bbea3f3599b72dae21f673da778dd5e1..91ef56c8c0e9099d22a738b8d415ea94e7946e1d 100644 (file)
@@ -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>
index d751724842cf495e0db5a9fb56e1ce8df239e544..8cdb448f23d457115b88d6c5daaadc584c31c0a1 100644 (file)
@@ -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>
index 5e009268f85579ee90cf2a7439db2d61b22e6e4b..6417d30395a17ebf3c1172ffc86f695bb2f929c2 100644 (file)
@@ -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>
index 5423f3afe6c6dfbce64c19f86078d0f02aabba36..4997bf099251ea5955930d2408bf5cbf9eafe319 100644 (file)
@@ -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>
index 159254ec01e7acc7b88631e703d892c16345e3b4..199bf34f24794465b52371fa004bb9ed3323b5bf 100644 (file)
@@ -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>
index 9e57184905a9835611f5ba16ad66dd68ac43207f..119ed9faed8322b2fa5f03690618352c9ff66311 100644 (file)
@@ -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>
index b379a90354da061d4947ea9b609561ef467a4bb1..0efc1cc1b223f257aad2adcc0dfa0f77e2ac8cac 100644 (file)
@@ -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>
index a0f4d2571f5c1e1b015b97946fa0611e8a648dc8..d0c646f58e0d3518877611ef46eae59f468bf456 100644 (file)
@@ -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>
index 909cec97d2e20f58d99f03dcec637b2d308390c9..0e603a5b7611d56206ce090b261a8adcb695e687 100644 (file)
@@ -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>
index 563df42316d532b5c15bdd673eeb18f0cfbea0af..1e842347fa36d10c8932d3f7aadea3e31a1bc929 100644 (file)
@@ -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>
index d1975f47b342d7252eaea8ed87ab7678b33b425c..f09e57346dc5559a8452aed5d3bfe09e939f1caa 100644 (file)
@@ -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>
index 1d8895f9f80c46a526627772f351e0ba967abb65..8f9e0aa6c1136b8406aa5cf7cc5631d9c3ab2001 100644 (file)
@@ -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>
index db34e27f39dcc7b0cbe35e0cdaafd943553387c8..52a7a9bda8806691d6681ee6dac9afc322dae8c0 100644 (file)
@@ -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>
index 378f70e607b5064a6b0ebf66a448299860055925..65bd6e94c2c73ac3ffb6df907fbbcdfb7e93cf13 100644 (file)
@@ -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>
index f259fb42ea7718a7fbca71b8ce260b3556ac6cc4..04e90071ea76253012cc6060bdd03ff37f6cecd6 100644 (file)
@@ -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>
index f0aebecca4b7a3a13193be7d79aaf15408de5843..b2876143182a15aa8eb3219c7f6bd9e588904912 100644 (file)
@@ -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>
index 811d99f6a4bc5bc4d9db8f4a22c183f36db3ce7a..2799816ad0887aec30afa84682a67dbdfe9031c4 100644 (file)
@@ -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>
index eb895b42e319810c0d6a48bf7c74f156d1d6b637..80c74e2273bc04b29eaf0eccb8c7581a12fe62c4 100644 (file)
@@ -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>
index 9a2c457384aeced89a64efc3903ce006e6638853..a5c40efffb705a5ad777542906e790702c17cc4a 100644 (file)
@@ -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>
index 6591511485bf9ec33d8f853369447ab3044eca10..1b4fde704a8fe488a2f8d2c5963c9cf268e86a4f 100644 (file)
@@ -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>
index c15d7d5cf8e4a55903755382abe066b08e9f5fe1..5a6ffa32674187c8951b0b92120002ed4ed3d872 100644 (file)
@@ -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>
index d9436430f01a104319fa37e0231eddd872a3e6ff..e37462fcd71bd5f0cdfa8344c62d56861ce4b0e6 100644 (file)
@@ -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>
index 88d44b4f72333213b3234d96c8fd6838b18b8ae1..844b5f9cf34258b987775c23f650532627f70ffb 100644 (file)
@@ -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>
index 1f08169081d7a857233976f75197dc89e56dedb1..59a53c370c2cb2acc8b6a303d7dfd073c08d10b2 100644 (file)
@@ -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>
index d911a28897d983f1976f0e54a2f7d0a160e6fb60..5da3efb03e71f8fc168b9069899bbd78660483aa 100644 (file)
@@ -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>
index 01133bb19371d42c64ce1717efa5644caf832641..fea4ba4ed75836cf2576136bb3e94e099c21b179 100644 (file)
@@ -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>
index a0cbe9a8a835f6fdaced790f335be6a32644bc2c..a3453b654ebbcf0d439833d57fe2b91b0145e3af 100644 (file)
@@ -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>
index afbf3190d0cde318662f75b3c907b90d4c78fd82..354e31761624b025e39942e0679dcde586b873a2 100644 (file)
@@ -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>
index 296c5900dfe740664c3a02e8cb30bb97283d27b4..a09ab92bfd0dec3f752aa1c15db1ef844371e5e5 100644 (file)
@@ -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>
index 70520eaf8c5a14e5d597c86dc0bb005ec977d62d..e8a165e6df8eb3c4a58f64124b721600023f90bb 100644 (file)
@@ -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>
index d27b65469be528921e8dcbb9b96fbb90be764af5..dba67d644d411ffafc108727abd83ac815adb8c4 100644 (file)
@@ -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>
index b77058091a38a666f7d7c0c736921b41125c704b..736e279c223734a4819f81e7c62dd14aefce175d 100644 (file)
@@ -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>
index 514898aebb369538f2ba760f64da177b06c8c170..e42958803e8fb0d159fdf764a4642863c7bb2290 100644 (file)
@@ -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>
index 73deb7b7d5f719655eddba01f640d55b4cc255a4..681af3f1a55f546ca25dba851f9ece2007c16ad2 100644 (file)
@@ -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>
index 8afcdad9d20e437229e38de086afaeeab7301a70..127be1df775f667952977088ad52e3971575c05a 100644 (file)
@@ -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>
index 0bfe51c7cc396939143294c2c2a4ca5ac195c7dd..684c2676c360a2301dd02e43713061664947651e 100644 (file)
@@ -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>
index f976392e0a37146a92c266370aa67f96bb68d2e4..e2362d8d2ba49fa12d8c9c80b1f1c1082ea23641 100644 (file)
@@ -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>
index 6f7e62c8ba1d54e6594000580b05b2dbb1e3d262..19593faccbb7840d00eb76f4c60cf4ee2c23e293 100644 (file)
@@ -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>
index 022834b279e5b4028dbe39251e0baa6cc47030e0..1165d7a5c4995da0ea5797edb0284b996cb46d6d 100644 (file)
@@ -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>
index 2ac45848e90b63ea0aa26b5ffbb79dad17d93b88..ff8c8f04ca6277bc332564adb9d1d26c00dfd7cb 100644 (file)
@@ -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>
index cf917be0f6c0d55e094c30feb97102c95bd4f0ff..b2b96965db8f0829122986146e1331ea2082c2dd 100644 (file)
@@ -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>
index 9e318701e7315b9b1cffaed893558a2c6f0e9f5d..dec45af5c79ccd27a8e38f4ec32ad375a30d1bba 100644 (file)
@@ -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>
index 05db912b2331a6eb6a37849c63991125340ccba5..5b7e57ae2b06b623a502ff818fe142494f6b0b0b 100644 (file)
@@ -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>
index e653f62748bfd2e70745cb5348fbc21b3459bfff..6a8d03b6ee2383eb298cb08afe3881300c478515 100644 (file)
@@ -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>
index 2a7441545765e918562fc4dc3b502f7343270b1d..6738b644ccd87889d0541fe139e6e26ab8f3a41a 100644 (file)
@@ -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>
index 306d7add2ccd35f9651ec53a1a7b337d4369cbfb..b370bf989aacb6e986b9e22d9aec77fe8b85ac2d 100644 (file)
@@ -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"
index 2083ce08129d9579231262e2b990e582ed5afecd..67e54c1b8dcc2ce1b3d830e22085a63ecdaebfe9 100644 (file)
@@ -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"
index 34d5b1e3bd85b3205836e79856f4292965597264..b41cfacbe0f29bdee98172b1e4414cdcde8e3c41 100644 (file)
@@ -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"
index 914c40e2aee0010562d0695834e7490cad218a84..e1d858a327d5bd49d47c563017d69877ab0082d8 100644 (file)
@@ -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"
index 665d60245e233c6b971c3904d6441696e000a1a0..28cc3b93dc8f4fa28646c883f0ddefb99c1d59f8 100644 (file)
@@ -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"
index 2843921cd9101669111425ce61d6506cbb2d10bc..d9415fcb8713c06171c7f75bcaba89944fd9f1d9 100644 (file)
@@ -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"
index 687385ab82c89995bcfef75e3720f1a62ef02d74..ef7f9940200d120bf960c21d590e8e214e45618c 100644 (file)
@@ -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"
index 3c1b7ac042ab6d48d0edd6ec8a070cb1cd55d44d..b036c2c4a9450c437b8cee5498ade5e5c6ea6b11 100644 (file)
@@ -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"
index b7570643a41805a94dbd98b7b31265a3cd01b5fd..6c3868c49819cbccf2a38ffc984617c4e9ab0d36 100644 (file)
@@ -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"
index 7d57310f382ea2f0bf06fdf3ad0014faf8ac42d0..b17113457f077ee0162a8609b745ea4f9f2c93b6 100644 (file)
@@ -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"
index 63266fbd0165be747f2f65bab06d90a00cee71c4..f9469b159dd0aa7d75c3b0f5c1763d836c842767 100644 (file)
@@ -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"
index 301d7c3d7583b07968e1bef22dea0ede459bf9b7..2e229940ccaff32d03c0635aaaa0b48aec7df77b 100644 (file)
@@ -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"
index 89bc3d19c0d58a210ef1748dfc719973c3cfddfc..2e1e1337dbc284d277854895eba372a1797bca20 100644 (file)
@@ -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>
index fa43e5757f3c171483e4fed8666962934a68cb95..219f3c3754bf8b1c87c6621bbd867b8532e4b5f2 100644 (file)
@@ -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>
index f0d22cea685f154765b92038661e52c923345ded..e45e94fe70c68f20007176a2266588b49d375f36 100644 (file)
@@ -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>
index 359e0a31a6eba4310e6ca32d07240e8d3558ce8e..352052677471779af5562c0e7b565fbbdd3d6dfe 100644 (file)
@@ -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>
index edb4c5f9c6e55506c45947760e0ec71bb0fe83f6..7548b2a74bbb9e326de20f884cadfb177ab76bc1 100644 (file)
@@ -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>
index daa018e55dcf044561f9a0b40d5578dcc33427b9..5145a65a287025617f11d77a42a13fa8f1eba345 100644 (file)
@@ -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>
index 90df27bc8512b663e792765bfb8dda713414ddbf..f32cbc7076d28a60e5ef1e37c5108ff0ba5afa10 100644 (file)
@@ -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>