bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 2/2] conditional dependencies between modules


From: Bruno Haible
Subject: [PATCH 2/2] conditional dependencies between modules
Date: Mon, 2 May 2011 02:04:46 +0200
User-agent: KMail/1.9.9

Here's the proposed conditions for the dependencies for most modules.

I have created them by looking for the AC_LIBOBJ invocations. For most modules,
we have a few dependencies that are unconditional (often only a header file
module and optionally 'extensions'); the remaining dependencies exist for
being able to compile the C code that is designated through the AC_LIBOBJ.

As you can see, it is pretty straightforward to generate these conditions.
If modern idioms are used, the condition in module 'foo' is
    test $HAVE_FOO = 0 || test $REPLACE_FOO = 1

There are also a few modules that don't fit into this simple scheme, like
'openat' (which really ought to be split into one module per function).

It would be possible to optimize the conditions even more by looking inside
the .c files for #if conditions. I haven't gone that far, except for the
modules 'strtoimax' and 'strtoumax'.

Please review. For now, the dependencies are exploited only when the option
--conditional-dependencies is passed. But I would love to make it the
default when --with-tests is not specified.


2011-05-01  Bruno Haible  <address@hidden>

        * modules/accept (Depends-on): Add conditions to the dependencies.
        * modules/acosl (Depends-on): Likewise.
        * modules/argz (Depends-on): Likewise.
        * modules/asinl (Depends-on): Likewise.
        * modules/atanl (Depends-on): Likewise.
        * modules/atoll (Depends-on): Likewise.
        * modules/bind (Depends-on): Likewise.
        * modules/btowc (Depends-on): Likewise.
        * modules/canonicalize-lgpl (Depends-on): Likewise.
        * modules/ceil (Depends-on): Likewise.
        * modules/ceilf (Depends-on): Likewise.
        * modules/ceill (Depends-on): Likewise.
        * modules/chdir-long (Depends-on): Likewise.
        * modules/chown (Depends-on): Likewise.
        * modules/close (Depends-on): Likewise.
        * modules/connect (Depends-on): Likewise.
        * modules/cosl (Depends-on): Likewise.
        * modules/dirfd (Depends-on): Likewise.
        * modules/dprintf (Depends-on): Likewise.
        * modules/dprintf-posix (Depends-on): Likewise.
        * modules/error (Depends-on): Likewise.
        * modules/euidaccess (Depends-on): Likewise.
        * modules/expl (Depends-on): Likewise.
        * modules/faccessat (Depends-on): Likewise.
        * modules/fchdir (Depends-on): Likewise.
        * modules/fclose (Depends-on): Likewise.
        * modules/fcntl (Depends-on): Likewise.
        * modules/fdopendir (Depends-on): Likewise.
        * modules/fflush (Depends-on): Likewise.
        * modules/floor (Depends-on): Likewise.
        * modules/floorf (Depends-on): Likewise.
        * modules/floorl (Depends-on): Likewise.
        * modules/fnmatch (Depends-on): Likewise.
        * modules/fopen (Depends-on): Likewise.
        * modules/fprintf-posix (Depends-on): Likewise.
        * modules/frexp (Depends-on): Likewise.
        * modules/frexp-nolibm (Depends-on): Likewise.
        * modules/frexpl (Depends-on): Likewise.
        * modules/frexpl-nolibm (Depends-on): Likewise.
        * modules/fseek (Depends-on): Likewise.
        * modules/fsusage (Depends-on): Likewise.
        * modules/ftell (Depends-on): Likewise.
        * modules/ftello (Depends-on): Likewise.
        * modules/futimens (Depends-on): Likewise.
        * modules/getcwd (Depends-on): Likewise.
        * modules/getcwd-lgpl (Depends-on): Likewise.
        * modules/getdelim (Depends-on): Likewise.
        * modules/getdomainname (Depends-on): Likewise.
        * modules/getgroups (Depends-on): Likewise.
        * modules/gethostname (Depends-on): Likewise.
        * modules/getline (Depends-on): Likewise.
        * modules/getlogin_r (Depends-on): Likewise.
        * modules/getopt-posix (Depends-on): Likewise.
        * modules/getpeername (Depends-on): Likewise.
        * modules/getsockname (Depends-on): Likewise.
        * modules/getsockopt (Depends-on): Likewise.
        * modules/getsubopt (Depends-on): Likewise.
        * modules/getusershell (Depends-on): Likewise.
        * modules/glob (Depends-on): Likewise.
        * modules/grantpt (Depends-on): Likewise.
        * modules/iconv_open (Depends-on): Likewise.
        * modules/iconv_open-utf (Depends-on): Likewise.
        * modules/inet_ntop (Depends-on): Likewise.
        * modules/inet_pton (Depends-on): Likewise.
        * modules/ioctl (Depends-on): Likewise.
        * modules/isapipe (Depends-on): Likewise.
        * modules/isfinite (Depends-on): Likewise.
        * modules/isinf (Depends-on): Likewise.
        * modules/lchown (Depends-on): Likewise.
        * modules/ldexpl (Depends-on): Likewise.
        * modules/link (Depends-on): Likewise.
        * modules/linkat (Depends-on): Likewise.
        * modules/listen (Depends-on): Likewise.
        * modules/logl (Depends-on): Likewise.
        * modules/lstat (Depends-on): Likewise.
        * modules/mbrlen (Depends-on): Likewise.
        * modules/mbrtowc (Depends-on): Likewise.
        * modules/mbsinit (Depends-on): Likewise.
        * modules/mbsnrtowcs (Depends-on): Likewise.
        * modules/mbsrtowcs (Depends-on): Likewise.
        * modules/mbtowc (Depends-on): Likewise.
        * modules/memcmp (Depends-on): Likewise.
        * modules/mkdir (Depends-on): Likewise.
        * modules/mkdtemp (Depends-on): Likewise.
        * modules/mkfifo (Depends-on): Likewise.
        * modules/mkfifoat (Depends-on): Likewise.
        * modules/mknod (Depends-on): Likewise.
        * modules/mkostemp (Depends-on): Likewise.
        * modules/mkostemps (Depends-on): Likewise.
        * modules/mkstemp (Depends-on): Likewise.
        * modules/mkstemps (Depends-on): Likewise.
        * modules/mktime (Depends-on): Likewise.
        * modules/nanosleep (Depends-on): Likewise.
        * modules/open (Depends-on): Likewise.
        * modules/openat (Depends-on): Likewise.
        * modules/perror (Depends-on): Likewise.
        * modules/poll (Depends-on): Likewise.
        * modules/popen (Depends-on): Likewise.
        * modules/posix_spawn (Depends-on): Likewise.
        * modules/posix_spawn_file_actions_addclose (Depends-on): Likewise.
        * modules/posix_spawn_file_actions_adddup2 (Depends-on): Likewise.
        * modules/posix_spawn_file_actions_addopen (Depends-on): Likewise.
        * modules/posix_spawnp (Depends-on): Likewise.
        * modules/pread (Depends-on): Likewise.
        * modules/printf-posix (Depends-on): Likewise.
        * modules/ptsname (Depends-on): Likewise.
        * modules/putenv (Depends-on): Likewise.
        * modules/pwrite (Depends-on): Likewise.
        * modules/readline (Depends-on): Likewise.
        * modules/readlink (Depends-on): Likewise.
        * modules/readlinkat (Depends-on): Likewise.
        * modules/recv (Depends-on): Likewise.
        * modules/recvfrom (Depends-on): Likewise.
        * modules/regex (Depends-on): Likewise.
        * modules/remove (Depends-on): Likewise.
        * modules/rename (Depends-on): Likewise.
        * modules/renameat (Depends-on): Likewise.
        * modules/rmdir (Depends-on): Likewise.
        * modules/round (Depends-on): Likewise.
        * modules/roundf (Depends-on): Likewise.
        * modules/roundl (Depends-on): Likewise.
        * modules/rpmatch (Depends-on): Likewise.
        * modules/select (Depends-on): Likewise.
        * modules/send (Depends-on): Likewise.
        * modules/sendto (Depends-on): Likewise.
        * modules/setenv (Depends-on): Likewise.
        * modules/setlocale (Depends-on): Likewise.
        * modules/setsockopt (Depends-on): Likewise.
        * modules/shutdown (Depends-on): Likewise.
        * modules/sigaction (Depends-on): Likewise.
        * modules/signbit (Depends-on): Likewise.
        * modules/sigprocmask (Depends-on): Likewise.
        * modules/sinl (Depends-on): Likewise.
        * modules/sleep (Depends-on): Likewise.
        * modules/snprintf (Depends-on): Likewise.
        * modules/snprintf-posix (Depends-on): Likewise.
        * modules/socket (Depends-on): Likewise.
        * modules/sprintf-posix (Depends-on): Likewise.
        * modules/sqrtl (Depends-on): Likewise.
        * modules/stat (Depends-on): Likewise.
        * modules/strchrnul (Depends-on): Likewise.
        * modules/strdup-posix (Depends-on): Likewise.
        * modules/strerror (Depends-on): Likewise.
        * modules/strerror_r-posix (Depends-on): Likewise.
        * modules/strndup (Depends-on): Likewise.
        * modules/strnlen (Depends-on): Likewise.
        * modules/strptime (Depends-on): Likewise.
        * modules/strsep (Depends-on): Likewise.
        * modules/strsignal (Depends-on): Likewise.
        * modules/strstr-simple (Depends-on): Likewise.
        * modules/strtod (Depends-on): Likewise.
        * modules/strtoimax (Depends-on): Likewise.
        * modules/strtok_r (Depends-on): Likewise.
        * modules/strtoumax (Depends-on): Likewise.
        * modules/symlink (Depends-on): Likewise.
        * modules/symlinkat (Depends-on): Likewise.
        * modules/tanl (Depends-on): Likewise.
        * modules/tcgetsid (Depends-on): Likewise.
        * modules/tmpfile (Depends-on): Likewise.
        * modules/trunc (Depends-on): Likewise.
        * modules/truncf (Depends-on): Likewise.
        * modules/truncl (Depends-on): Likewise.
        * modules/uname (Depends-on): Likewise.
        * modules/unlink (Depends-on): Likewise.
        * modules/unlockpt (Depends-on): Likewise.
        * modules/unsetenv (Depends-on): Likewise.
        * modules/usleep (Depends-on): Likewise.
        * modules/utimensat (Depends-on): Likewise.
        * modules/vasprintf (Depends-on): Likewise.
        * modules/vdprintf (Depends-on): Likewise.
        * modules/vdprintf-posix (Depends-on): Likewise.
        * modules/vfprintf-posix (Depends-on): Likewise.
        * modules/vprintf-posix (Depends-on): Likewise.
        * modules/vsnprintf (Depends-on): Likewise.
        * modules/vsnprintf-posix (Depends-on): Likewise.
        * modules/vsprintf-posix (Depends-on): Likewise.
        * modules/wcrtomb (Depends-on): Likewise.
        * modules/wcscasecmp (Depends-on): Likewise.
        * modules/wcscspn (Depends-on): Likewise.
        * modules/wcsdup (Depends-on): Likewise.
        * modules/wcsncasecmp (Depends-on): Likewise.
        * modules/wcsnrtombs (Depends-on): Likewise.
        * modules/wcspbrk (Depends-on): Likewise.
        * modules/wcsrtombs (Depends-on): Likewise.
        * modules/wcsspn (Depends-on): Likewise.
        * modules/wcsstr (Depends-on): Likewise.
        * modules/wcstok (Depends-on): Likewise.
        * modules/wcswidth (Depends-on): Likewise.
        * modules/wctob (Depends-on): Likewise.
        * modules/wctomb (Depends-on): Likewise.
        * modules/wctype (Depends-on): Likewise.
        * modules/wcwidth (Depends-on): Likewise.
        * modules/write (Depends-on): Likewise.

--- modules/accept.orig Mon May  2 01:51:08 2011
+++ modules/accept      Sun May  1 22:09:53 2011
@@ -7,7 +7,7 @@
 
 Depends-on:
 sys_socket
-errno
+errno           [test "$ac_cv_header_winsock2_h" = yes]
 
 configure.ac:
 AC_REQUIRE([gl_HEADER_SYS_SOCKET])
--- modules/acosl.orig  Mon May  2 01:51:08 2011
+++ modules/acosl       Sun May  1 18:03:02 2011
@@ -8,8 +8,8 @@
 Depends-on:
 math
 extensions
-asinl
-sqrtl
+asinl           [test $HAVE_ACOSL = 0]
+sqrtl           [test $HAVE_ACOSL = 0]
 
 configure.ac:
 gl_FUNC_ACOSL
--- modules/argz.orig   Mon May  2 01:51:08 2011
+++ modules/argz        Sun May  1 22:56:49 2011
@@ -7,12 +7,12 @@
 m4/argz.m4
 
 Depends-on:
-memmove
-mempcpy
-stpcpy
-strndup
-strnlen
-strstr
+memmove         [test -n "$ARGZ_H"]
+mempcpy         [test -n "$ARGZ_H"]
+stpcpy          [test -n "$ARGZ_H"]
+strndup         [test -n "$ARGZ_H"]
+strnlen         [test -n "$ARGZ_H"]
+strstr          [test -n "$ARGZ_H"]
 
 configure.ac:
 gl_FUNC_ARGZ
--- modules/asinl.orig  Mon May  2 01:51:08 2011
+++ modules/asinl       Sun May  1 18:03:21 2011
@@ -8,7 +8,7 @@
 Depends-on:
 math
 extensions
-sqrtl
+sqrtl           [test $HAVE_ASINL = 0]
 
 configure.ac:
 gl_FUNC_ASINL
--- modules/atanl.orig  Mon May  2 01:51:08 2011
+++ modules/atanl       Sun May  1 18:03:43 2011
@@ -8,7 +8,7 @@
 Depends-on:
 math
 extensions
-isnanl
+isnanl          [test $HAVE_ATANL = 0]
 
 configure.ac:
 gl_FUNC_ATANL
--- modules/atoll.orig  Mon May  2 01:51:08 2011
+++ modules/atoll       Sun May  1 18:04:27 2011
@@ -7,7 +7,7 @@
 m4/longlong.m4
 
 Depends-on:
-strtoll
+strtoll         [test $HAVE_ATOLL = 0]
 
 configure.ac:
 gl_FUNC_ATOLL
--- modules/bind.orig   Mon May  2 01:51:08 2011
+++ modules/bind        Sun May  1 22:10:01 2011
@@ -7,7 +7,7 @@
 
 Depends-on:
 sys_socket
-errno
+errno           [test "$ac_cv_header_winsock2_h" = yes]
 
 configure.ac:
 AC_REQUIRE([gl_HEADER_SYS_SOCKET])
--- modules/btowc.orig  Mon May  2 01:51:08 2011
+++ modules/btowc       Sun May  1 18:05:12 2011
@@ -8,7 +8,7 @@
 
 Depends-on:
 wchar
-mbtowc
+mbtowc          [test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1]
 
 configure.ac:
 gl_FUNC_BTOWC
--- modules/canonicalize-lgpl.orig      Mon May  2 01:51:08 2011
+++ modules/canonicalize-lgpl   Sun May  1 18:27:00 2011
@@ -7,16 +7,16 @@
 m4/double-slash-root.m4
 
 Depends-on:
-alloca-opt
-errno
 extensions
-lstat
-malloca
-memmove
-pathmax
-readlink
 stdlib
-sys_stat
+alloca-opt      [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test 
$REPLACE_CANONICALIZE_FILE_NAME = 1]
+errno           [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test 
$REPLACE_CANONICALIZE_FILE_NAME = 1]
+lstat           [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test 
$REPLACE_CANONICALIZE_FILE_NAME = 1]
+malloca         [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test 
$REPLACE_CANONICALIZE_FILE_NAME = 1]
+memmove         [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test 
$REPLACE_CANONICALIZE_FILE_NAME = 1]
+pathmax         [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test 
$REPLACE_CANONICALIZE_FILE_NAME = 1]
+readlink        [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test 
$REPLACE_CANONICALIZE_FILE_NAME = 1]
+sys_stat        [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test 
$REPLACE_CANONICALIZE_FILE_NAME = 1]
 
 configure.ac:
 gl_CANONICALIZE_LGPL
--- modules/ceil.orig   Mon May  2 01:51:08 2011
+++ modules/ceil        Sun May  1 22:57:29 2011
@@ -7,7 +7,7 @@
 
 Depends-on:
 math
-float
+float           [test $REPLACE_CEIL = 1]
 
 configure.ac:
 gl_FUNC_CEIL
--- modules/ceilf.orig  Mon May  2 01:51:08 2011
+++ modules/ceilf       Sun May  1 22:57:49 2011
@@ -9,7 +9,7 @@
 Depends-on:
 math
 extensions
-float
+float           [test $HAVE_DECL_CEILF = 0 || test $REPLACE_CEILF = 1]
 
 configure.ac:
 gl_FUNC_CEILF
--- modules/ceill.orig  Mon May  2 01:51:08 2011
+++ modules/ceill       Sun May  1 22:58:08 2011
@@ -9,7 +9,7 @@
 Depends-on:
 math
 extensions
-float
+float           [test $HAVE_DECL_CEILL = 0 || test $REPLACE_CEILL = 1]
 
 configure.ac:
 gl_FUNC_CEILL
--- modules/chdir-long.orig     Mon May  2 01:51:08 2011
+++ modules/chdir-long  Sun May  1 23:00:08 2011
@@ -7,14 +7,15 @@
 m4/chdir-long.m4
 
 Depends-on:
-atexit
-fchdir
-fcntl-h
-openat
-memchr
-mempcpy
-memrchr
-stdbool
+unistd
+atexit          [test $gl_cv_have_arbitrary_file_name_length_limit = yes]
+fchdir          [test $gl_cv_have_arbitrary_file_name_length_limit = yes]
+fcntl-h         [test $gl_cv_have_arbitrary_file_name_length_limit = yes]
+openat          [test $gl_cv_have_arbitrary_file_name_length_limit = yes]
+memchr          [test $gl_cv_have_arbitrary_file_name_length_limit = yes]
+mempcpy         [test $gl_cv_have_arbitrary_file_name_length_limit = yes]
+memrchr         [test $gl_cv_have_arbitrary_file_name_length_limit = yes]
+stdbool         [test $gl_cv_have_arbitrary_file_name_length_limit = yes]
 
 configure.ac:
 gl_FUNC_CHDIR_LONG
--- modules/chown.orig  Mon May  2 01:51:08 2011
+++ modules/chown       Sun May  1 18:29:23 2011
@@ -7,11 +7,11 @@
 m4/chown.m4
 
 Depends-on:
-open
-stat
-stdbool
-sys_stat
 unistd
+open            [test $HAVE_CHOWN = 0 || test $REPLACE_CHOWN = 1]
+stat            [test $HAVE_CHOWN = 0 || test $REPLACE_CHOWN = 1]
+stdbool         [test $HAVE_CHOWN = 0 || test $REPLACE_CHOWN = 1]
+sys_stat        [test $HAVE_CHOWN = 0 || test $REPLACE_CHOWN = 1]
 
 configure.ac:
 gl_FUNC_CHOWN
--- modules/close.orig  Mon May  2 01:51:08 2011
+++ modules/close       Sun May  1 18:30:50 2011
@@ -7,7 +7,7 @@
 
 Depends-on:
 unistd
-fd-hook
+fd-hook         [test $REPLACE_CLOSE = 1]
 fclose
 
 configure.ac:
--- modules/connect.orig        Mon May  2 01:51:08 2011
+++ modules/connect     Sun May  1 22:09:41 2011
@@ -7,7 +7,7 @@
 
 Depends-on:
 sys_socket
-errno
+errno           [test "$ac_cv_header_winsock2_h" = yes]
 
 configure.ac:
 AC_REQUIRE([gl_HEADER_SYS_SOCKET])
--- modules/cosl.orig   Mon May  2 01:51:08 2011
+++ modules/cosl        Sun May  1 18:33:07 2011
@@ -11,10 +11,10 @@
 Depends-on:
 math
 extensions
-float
-isnanl
-floor
-floorl
+float           [test $HAVE_COSL = 0]
+isnanl          [test $HAVE_COSL = 0]
+floor           [test $HAVE_COSL = 0]
+floorl          [test $HAVE_COSL = 0]
 
 configure.ac:
 gl_FUNC_COSL
--- modules/dirfd.orig  Mon May  2 01:51:08 2011
+++ modules/dirfd       Sun May  1 23:12:47 2011
@@ -7,8 +7,8 @@
 
 Depends-on:
 dirent
-errno
 extensions
+errno           [test $ac_cv_have_decl_dirfd = no || test $REPLACE_DIRFD = 1]
 
 configure.ac:
 gl_FUNC_DIRFD
--- modules/dprintf.orig        Mon May  2 01:51:08 2011
+++ modules/dprintf     Sun May  1 21:58:55 2011
@@ -7,9 +7,9 @@
 
 Depends-on:
 stdio
-vasnprintf
-full-write
-errno
+vasnprintf      [test $ac_cv_func_dprintf = no || test $REPLACE_DPRINTF = 1]
+full-write      [test $ac_cv_func_dprintf = no || test $REPLACE_DPRINTF = 1]
+errno           [test $ac_cv_func_dprintf = no || test $REPLACE_DPRINTF = 1]
 
 configure.ac:
 gl_FUNC_DPRINTF
--- modules/dprintf-posix.orig  Mon May  2 01:51:08 2011
+++ modules/dprintf-posix       Sun May  1 21:59:19 2011
@@ -14,18 +14,18 @@
 
 Depends-on:
 dprintf
-vasnprintf
-isnand-nolibm
-isnanl-nolibm
-frexp-nolibm
-frexpl-nolibm
-printf-frexp
-printf-frexpl
-signbit
-fpucw
 nocrash
 printf-safe
 multiarch
+vasnprintf      [test $ac_cv_func_dprintf = no || test $REPLACE_DPRINTF = 1]
+isnand-nolibm   [test $ac_cv_func_dprintf = no || test $REPLACE_DPRINTF = 1]
+isnanl-nolibm   [test $ac_cv_func_dprintf = no || test $REPLACE_DPRINTF = 1]
+frexp-nolibm    [test $ac_cv_func_dprintf = no || test $REPLACE_DPRINTF = 1]
+frexpl-nolibm   [test $ac_cv_func_dprintf = no || test $REPLACE_DPRINTF = 1]
+printf-frexp    [test $ac_cv_func_dprintf = no || test $REPLACE_DPRINTF = 1]
+printf-frexpl   [test $ac_cv_func_dprintf = no || test $REPLACE_DPRINTF = 1]
+signbit         [test $ac_cv_func_dprintf = no || test $REPLACE_DPRINTF = 1]
+fpucw           [test $ac_cv_func_dprintf = no || test $REPLACE_DPRINTF = 1]
 
 configure.ac:
 gl_FUNC_DPRINTF_POSIX
--- modules/error.orig  Mon May  2 01:51:09 2011
+++ modules/error       Sun May  1 23:14:28 2011
@@ -12,8 +12,8 @@
 m4/error.m4
 
 Depends-on:
-strerror
-unistd
+strerror        [test $ac_cv_lib_error_at_line = no]
+unistd          [test $ac_cv_lib_error_at_line = no]
 
 configure.ac:
 gl_ERROR
--- modules/euidaccess.orig     Mon May  2 01:51:09 2011
+++ modules/euidaccess  Sun May  1 23:51:17 2011
@@ -8,9 +8,9 @@
 Depends-on:
 unistd
 extensions
-group-member
-stat
-sys_stat
+group-member    [test $HAVE_EUIDACCESS = 0]
+stat            [test $HAVE_EUIDACCESS = 0]
+sys_stat        [test $HAVE_EUIDACCESS = 0]
 
 configure.ac:
 gl_FUNC_EUIDACCESS
--- modules/expl.orig   Mon May  2 01:51:09 2011
+++ modules/expl        Sun May  1 18:39:25 2011
@@ -8,8 +8,8 @@
 Depends-on:
 math
 extensions
-float
-floorl
+float           [test $HAVE_EXPL = 0]
+floorl          [test $HAVE_EXPL = 0]
 
 configure.ac:
 gl_FUNC_EXPL
--- modules/faccessat.orig      Mon May  2 01:51:09 2011
+++ modules/faccessat   Sun May  1 18:43:05 2011
@@ -6,11 +6,11 @@
 m4/faccessat.m4
 
 Depends-on:
-euidaccess
+unistd
 extensions
 fcntl-h
-openat
-unistd
+euidaccess      [test $HAVE_FACCESSAT = 0]
+openat          [test $HAVE_FACCESSAT = 0]
 
 configure.ac:
 gl_FUNC_FACCESSAT
--- modules/fchdir.orig Mon May  2 01:51:09 2011
+++ modules/fchdir      Sun May  1 18:46:44 2011
@@ -6,24 +6,23 @@
 m4/fchdir.m4
 
 Depends-on:
-close
-dirent
-dirfd
-dosname
-dup2
-fcntl
-fcntl-h
-filenamecat-lgpl
-getcwd-lgpl
-include_next
-malloc-posix
-open
-realloc-posix
-stat
-stdbool
-strdup-posix
-sys_stat
 unistd
+close            [test $HAVE_FCHDIR = 0]
+dirent           [test $HAVE_FCHDIR = 0]
+dirfd            [test $HAVE_FCHDIR = 0]
+dosname          [test $HAVE_FCHDIR = 0]
+dup2             [test $HAVE_FCHDIR = 0]
+fcntl            [test $HAVE_FCHDIR = 0]
+fcntl-h          [test $HAVE_FCHDIR = 0]
+filenamecat-lgpl [test $HAVE_FCHDIR = 0]
+getcwd-lgpl      [test $HAVE_FCHDIR = 0]
+malloc-posix     [test $HAVE_FCHDIR = 0]
+open             [test $HAVE_FCHDIR = 0]
+realloc-posix    [test $HAVE_FCHDIR = 0]
+stat             [test $HAVE_FCHDIR = 0]
+stdbool          [test $HAVE_FCHDIR = 0]
+strdup-posix     [test $HAVE_FCHDIR = 0]
+sys_stat         [test $HAVE_FCHDIR = 0]
 
 configure.ac:
 gl_FUNC_FCHDIR
--- modules/fclose.orig Mon May  2 01:51:09 2011
+++ modules/fclose      Sun May  1 18:50:27 2011
@@ -7,10 +7,10 @@
 
 Depends-on:
 stdio
-close
-fflush
-freading
-fseeko
+close           [test $REPLACE_FCLOSE = 1]
+fflush          [test $REPLACE_FCLOSE = 1]
+freading        [test $REPLACE_FCLOSE = 1]
+fseeko          [test $REPLACE_FCLOSE = 1]
 
 configure.ac:
 gl_FUNC_FCLOSE
--- modules/fcntl.orig  Mon May  2 01:51:09 2011
+++ modules/fcntl       Sun May  1 18:51:23 2011
@@ -6,10 +6,10 @@
 lib/fcntl.c
 
 Depends-on:
-dup2
 fcntl-h
-getdtablesize
 extensions
+dup2            [test $HAVE_FCNTL = 0 || test $REPLACE_FCNTL = 1]
+getdtablesize   [test $HAVE_FCNTL = 0 || test $REPLACE_FCNTL = 1]
 
 configure.ac:
 gl_FUNC_FCNTL
--- modules/fdopendir.orig      Mon May  2 01:51:09 2011
+++ modules/fdopendir   Sun May  1 18:52:56 2011
@@ -9,11 +9,11 @@
 
 Depends-on:
 dirent
-errno
 extensions
-fchdir
-openat-die
-save-cwd
+errno           [test $HAVE_FDOPENDIR = 0 || test $REPLACE_FDOPENDIR = 1]
+fchdir          [test $HAVE_FDOPENDIR = 0 || test $REPLACE_FDOPENDIR = 1]
+openat-die      [test $HAVE_FDOPENDIR = 0 || test $REPLACE_FDOPENDIR = 1]
+save-cwd        [test $HAVE_FDOPENDIR = 0 || test $REPLACE_FDOPENDIR = 1]
 
 configure.ac:
 gl_FUNC_FDOPENDIR
--- modules/fflush.orig Mon May  2 01:51:09 2011
+++ modules/fflush      Sun May  1 18:54:07 2011
@@ -7,13 +7,13 @@
 m4/fflush.m4
 
 Depends-on:
-fpurge
-ftello
-freading
-lseek
 stdio
-unistd
-fseeko
+fpurge          [test $REPLACE_FFLUSH = 1]
+ftello          [test $REPLACE_FFLUSH = 1]
+freading        [test $REPLACE_FFLUSH = 1]
+lseek           [test $REPLACE_FFLUSH = 1]
+unistd          [test $REPLACE_FFLUSH = 1]
+fseeko          [test $REPLACE_FFLUSH = 1]
 
 configure.ac-early:
 AC_REQUIRE([AC_FUNC_FSEEKO])
--- modules/floor.orig  Mon May  2 01:51:09 2011
+++ modules/floor       Sun May  1 23:17:00 2011
@@ -7,7 +7,7 @@
 
 Depends-on:
 math
-float
+float           [test $REPLACE_FLOOR = 1]
 
 configure.ac:
 gl_FUNC_FLOOR
--- modules/floorf.orig Mon May  2 01:51:09 2011
+++ modules/floorf      Sun May  1 23:17:23 2011
@@ -9,7 +9,7 @@
 Depends-on:
 math
 extensions
-float
+float           [test $HAVE_DECL_FLOORF = 0 || test $REPLACE_FLOORF = 1]
 
 configure.ac:
 gl_FUNC_FLOORF
--- modules/floorl.orig Mon May  2 01:51:09 2011
+++ modules/floorl      Sun May  1 23:17:42 2011
@@ -9,7 +9,7 @@
 Depends-on:
 math
 extensions
-float
+float           [test $HAVE_DECL_FLOORL = 0 || test $REPLACE_FLOORL = 1]
 
 configure.ac:
 gl_FUNC_FLOORL
--- modules/fnmatch.orig        Mon May  2 01:51:09 2011
+++ modules/fnmatch     Sun May  1 18:55:49 2011
@@ -11,14 +11,14 @@
 Depends-on:
 arg-nonnull
 extensions
-alloca
-stdbool
-wchar
-wctype-h
-memchr
-memcmp
-mbsrtowcs
-mbsinit
+alloca          [test -n "$FNMATCH_H"]
+stdbool         [test -n "$FNMATCH_H"]
+wchar           [test -n "$FNMATCH_H"]
+wctype-h        [test -n "$FNMATCH_H"]
+memchr          [test -n "$FNMATCH_H"]
+memcmp          [test -n "$FNMATCH_H"]
+mbsrtowcs       [test -n "$FNMATCH_H"]
+mbsinit         [test -n "$FNMATCH_H"]
 
 configure.ac:
 gl_FUNC_FNMATCH_POSIX
--- modules/fopen.orig  Mon May  2 01:51:09 2011
+++ modules/fopen       Sun May  1 23:18:05 2011
@@ -7,7 +7,7 @@
 
 Depends-on:
 stdio
-unistd
+unistd          [test $REPLACE_FOPEN = 1]
 
 configure.ac:
 gl_FUNC_FOPEN
--- modules/fprintf-posix.orig  Mon May  2 01:51:09 2011
+++ modules/fprintf-posix       Sun May  1 18:57:07 2011
@@ -14,20 +14,20 @@
 
 Depends-on:
 stdio
-fseterr
-vasnprintf
-isnand-nolibm
-isnanl-nolibm
-frexp-nolibm
-frexpl-nolibm
-printf-frexp
-printf-frexpl
-signbit
-fpucw
 nocrash
 printf-safe
 errno
 multiarch
+fseterr         [test $REPLACE_FPRINTF = 1]
+vasnprintf      [test $REPLACE_FPRINTF = 1]
+isnand-nolibm   [test $REPLACE_FPRINTF = 1]
+isnanl-nolibm   [test $REPLACE_FPRINTF = 1]
+frexp-nolibm    [test $REPLACE_FPRINTF = 1]
+frexpl-nolibm   [test $REPLACE_FPRINTF = 1]
+printf-frexp    [test $REPLACE_FPRINTF = 1]
+printf-frexpl   [test $REPLACE_FPRINTF = 1]
+signbit         [test $REPLACE_FPRINTF = 1]
+fpucw           [test $REPLACE_FPRINTF = 1]
 
 configure.ac:
 gl_FUNC_FPRINTF_POSIX
--- modules/frexp.orig  Mon May  2 01:51:09 2011
+++ modules/frexp       Sun May  1 19:20:21 2011
@@ -7,7 +7,7 @@
 
 Depends-on:
 math
-isnand-nolibm
+isnand-nolibm   [test $gl_func_frexp != yes]
 
 configure.ac:
 gl_FUNC_FREXP
--- modules/frexp-nolibm.orig   Mon May  2 01:51:09 2011
+++ modules/frexp-nolibm        Sun May  1 19:21:26 2011
@@ -7,7 +7,7 @@
 
 Depends-on:
 math
-isnand-nolibm
+isnand-nolibm   [test $gl_func_frexp_no_libm != yes]
 
 configure.ac:
 gl_FUNC_FREXP_NO_LIBM
--- modules/frexpl.orig Mon May  2 01:51:09 2011
+++ modules/frexpl      Sun May  1 19:22:40 2011
@@ -8,8 +8,8 @@
 
 Depends-on:
 math
-isnanl-nolibm
-fpucw
+isnanl-nolibm   [test $HAVE_DECL_FREXPL = 0 || test $gl_func_frexpl = no]
+fpucw           [test $HAVE_DECL_FREXPL = 0 || test $gl_func_frexpl = no]
 
 configure.ac:
 gl_FUNC_FREXPL
--- modules/frexpl-nolibm.orig  Mon May  2 01:51:09 2011
+++ modules/frexpl-nolibm       Sun May  1 19:22:37 2011
@@ -9,8 +9,8 @@
 
 Depends-on:
 math
-isnanl-nolibm
-fpucw
+isnanl-nolibm   [test $HAVE_DECL_FREXPL = 0 || test $gl_func_frexpl_no_libm = 
no]
+fpucw           [test $HAVE_DECL_FREXPL = 0 || test $gl_func_frexpl_no_libm = 
no]
 
 configure.ac:
 gl_FUNC_FREXPL_NO_LIBM
--- modules/fseek.orig  Mon May  2 01:51:09 2011
+++ modules/fseek       Sun May  1 19:24:02 2011
@@ -6,8 +6,8 @@
 m4/fseek.m4
 
 Depends-on:
-fseeko
 stdio
+fseeko          [test $REPLACE_FSEEK = 1]
 
 configure.ac:
 gl_FUNC_FSEEK
--- modules/fsusage.orig        Mon May  2 01:51:09 2011
+++ modules/fsusage     Sun May  1 23:19:54 2011
@@ -7,9 +7,9 @@
 m4/fsusage.m4
 
 Depends-on:
-full-read
 stdbool
 stdint
+full-read       [test $gl_cv_fs_space = yes]
 
 configure.ac:
 gl_FSUSAGE
--- modules/ftell.orig  Mon May  2 01:51:09 2011
+++ modules/ftell       Sun May  1 19:28:34 2011
@@ -6,9 +6,9 @@
 m4/ftell.m4
 
 Depends-on:
-ftello
 stdio
 errno
+ftello          [test $REPLACE_FTELL = 1]
 
 configure.ac:
 gl_FUNC_FTELL
--- modules/ftello.orig Mon May  2 01:51:09 2011
+++ modules/ftello      Sun May  1 19:29:19 2011
@@ -8,9 +8,9 @@
 m4/ftello.m4
 
 Depends-on:
-extensions
-lseek
 stdio
+extensions
+lseek           [test $HAVE_FTELLO = 0 || test $REPLACE_FTELLO = 1]
 
 configure.ac-early:
 AC_REQUIRE([AC_FUNC_FSEEKO])
--- modules/futimens.orig       Mon May  2 01:51:09 2011
+++ modules/futimens    Sun May  1 19:33:36 2011
@@ -7,8 +7,8 @@
 
 Depends-on:
 sys_stat
-utimens
 extensions
+utimens         [test $HAVE_FUTIMENS = 0 || test $REPLACE_FUTIMENS = 1]
 
 configure.ac:
 gl_FUNC_FUTIMENS
--- modules/getcwd.orig Mon May  2 01:51:09 2011
+++ modules/getcwd      Sun May  1 19:36:00 2011
@@ -8,15 +8,15 @@
 m4/getcwd.m4
 
 Depends-on:
-mempcpy
-d-ino
-extensions
-memmove
-openat
-stdbool
 unistd
-malloc-posix
-strdup-posix
+extensions
+mempcpy         [test $REPLACE_GETCWD = 1]
+d-ino           [test $REPLACE_GETCWD = 1]
+memmove         [test $REPLACE_GETCWD = 1]
+openat          [test $REPLACE_GETCWD = 1]
+stdbool         [test $REPLACE_GETCWD = 1]
+malloc-posix    [test $REPLACE_GETCWD = 1]
+strdup-posix    [test $REPLACE_GETCWD = 1]
 
 configure.ac:
 gl_FUNC_GETCWD
--- modules/getcwd-lgpl.orig    Mon May  2 01:51:09 2011
+++ modules/getcwd-lgpl Sun May  1 19:36:50 2011
@@ -6,8 +6,8 @@
 m4/getcwd.m4
 
 Depends-on:
-strdup
 unistd
+strdup          [test $REPLACE_GETCWD = 1]
 
 configure.ac:
 gl_FUNC_GETCWD_LGPL
--- modules/getdelim.orig       Mon May  2 01:51:09 2011
+++ modules/getdelim    Sun May  1 19:45:42 2011
@@ -6,11 +6,11 @@
 m4/getdelim.m4
 
 Depends-on:
-extensions
 stdio
-stdint
-realloc-posix
-errno
+extensions
+stdint          [test $HAVE_DECL_GETDELIM = 0 || test $REPLACE_GETDELIM = 1]
+realloc-posix   [test $HAVE_DECL_GETDELIM = 0 || test $REPLACE_GETDELIM = 1]
+errno           [test $HAVE_DECL_GETDELIM = 0 || test $REPLACE_GETDELIM = 1]
 
 configure.ac:
 gl_FUNC_GETDELIM
--- modules/getdomainname.orig  Mon May  2 01:51:09 2011
+++ modules/getdomainname       Sun May  1 23:20:57 2011
@@ -8,8 +8,8 @@
 Depends-on:
 unistd
 extensions
-netdb
-sys_socket
+netdb           [test $HAVE_DECL_GETDOMAINNAME = 0 || test 
$REPLACE_GETDOMAINNAME = 1]
+sys_socket      [test $HAVE_DECL_GETDOMAINNAME = 0 || test 
$REPLACE_GETDOMAINNAME = 1]
 
 configure.ac:
 gl_FUNC_GETDOMAINNAME
--- modules/getgroups.orig      Mon May  2 01:51:09 2011
+++ modules/getgroups   Sun May  1 19:46:39 2011
@@ -6,9 +6,9 @@
 m4/getgroups.m4
 
 Depends-on:
-malloc-posix
-stdint
 unistd
+malloc-posix    [test $HAVE_GETGROUPS = 0 || test $REPLACE_GETGROUPS = 1]
+stdint          [test $HAVE_GETGROUPS = 0 || test $REPLACE_GETGROUPS = 1]
 
 configure.ac:
 gl_FUNC_GETGROUPS
--- modules/gethostname.orig    Mon May  2 01:51:09 2011
+++ modules/gethostname Sun May  1 19:47:49 2011
@@ -8,9 +8,9 @@
 
 Depends-on:
 unistd
-sys_socket
-errno
-sockets
+sys_socket      [test $HAVE_GETHOSTNAME = 0]
+errno           [test $HAVE_GETHOSTNAME = 0]
+sockets         [test $HAVE_GETHOSTNAME = 0]
 
 configure.ac:
 gl_FUNC_GETHOSTNAME
--- modules/getline.orig        Mon May  2 01:51:09 2011
+++ modules/getline     Sun May  1 19:48:29 2011
@@ -6,9 +6,9 @@
 m4/getline.m4
 
 Depends-on:
-extensions
-getdelim
 stdio
+extensions
+getdelim        [test $REPLACE_GETLINE = 1]
 
 configure.ac:
 gl_FUNC_GETLINE
--- modules/getlogin_r.orig     Mon May  2 01:51:09 2011
+++ modules/getlogin_r  Sun May  1 19:49:00 2011
@@ -6,9 +6,9 @@
 m4/getlogin_r.m4
 
 Depends-on:
-extensions
 unistd
-memchr
+extensions
+memchr          [test $HAVE_GETLOGIN_R = 0 || test $REPLACE_GETLOGIN_R = 1]
 
 configure.ac:
 gl_FUNC_GETLOGIN_R
--- modules/getopt-posix.orig   Mon May  2 01:51:09 2011
+++ modules/getopt-posix        Sun May  1 19:51:13 2011
@@ -9,11 +9,11 @@
 m4/getopt.m4
 
 Depends-on:
-gettext-h
 unistd
 extensions
 include_next
 arg-nonnull
+gettext-h       [test $GNULIB_UNISTD_H_GETOPT = 1]
 
 configure.ac:
 gl_FUNC_GETOPT_POSIX
--- modules/getpeername.orig    Mon May  2 01:51:10 2011
+++ modules/getpeername Sun May  1 22:10:04 2011
@@ -8,7 +8,7 @@
 
 Depends-on:
 sys_socket
-errno
+errno           [test "$ac_cv_header_winsock2_h" = yes]
 
 configure.ac:
 AC_REQUIRE([gl_HEADER_SYS_SOCKET])
--- modules/getsockname.orig    Mon May  2 01:51:10 2011
+++ modules/getsockname Sun May  1 22:10:07 2011
@@ -8,7 +8,7 @@
 
 Depends-on:
 sys_socket
-errno
+errno           [test "$ac_cv_header_winsock2_h" = yes]
 
 configure.ac:
 AC_REQUIRE([gl_HEADER_SYS_SOCKET])
--- modules/getsockopt.orig     Mon May  2 01:51:10 2011
+++ modules/getsockopt  Sun May  1 22:10:16 2011
@@ -7,8 +7,8 @@
 
 Depends-on:
 sys_socket
-sys_time
-errno
+sys_time        [test "$ac_cv_header_winsock2_h" = yes]
+errno           [test "$ac_cv_header_winsock2_h" = yes]
 
 configure.ac:
 AC_REQUIRE([gl_HEADER_SYS_SOCKET])
--- modules/getsubopt.orig      Mon May  2 01:51:10 2011
+++ modules/getsubopt   Sun May  1 19:51:58 2011
@@ -6,10 +6,10 @@
 m4/getsubopt.m4
 
 Depends-on:
-extensions
-strchrnul
 stdlib
-memchr
+extensions
+strchrnul       [test $HAVE_GETSUBOPT = 0]
+memchr          [test $HAVE_GETSUBOPT = 0]
 
 configure.ac:
 gl_FUNC_GETSUBOPT
--- modules/getusershell.orig   Mon May  2 01:51:10 2011
+++ modules/getusershell        Sun May  1 23:25:11 2011
@@ -8,8 +8,8 @@
 Depends-on:
 unistd
 extensions
-fopen-safer
-xalloc
+fopen-safer     [test $ac_cv_func_getusershell = no]
+xalloc          [test $ac_cv_func_getusershell = no]
 
 configure.ac:
 gl_FUNC_GETUSERSHELL
--- modules/glob.orig   Mon May  2 01:51:10 2011
+++ modules/glob        Sun May  1 19:55:48 2011
@@ -9,22 +9,22 @@
 m4/glob.m4
 
 Depends-on:
-alloca
 arg-nonnull
 c++defs
-d-type
-dirfd
 extensions
-fnmatch
-getlogin_r
-memchr
-mempcpy
-stdbool
-strdup
-sys_stat
-unistd
 warn-on-use
-malloc-posix
+alloca          [test -n "$GLOB_H"]
+d-type          [test -n "$GLOB_H"]
+dirfd           [test -n "$GLOB_H"]
+fnmatch         [test -n "$GLOB_H"]
+getlogin_r      [test -n "$GLOB_H"]
+memchr          [test -n "$GLOB_H"]
+mempcpy         [test -n "$GLOB_H"]
+stdbool         [test -n "$GLOB_H"]
+strdup          [test -n "$GLOB_H"]
+sys_stat        [test -n "$GLOB_H"]
+unistd          [test -n "$GLOB_H"]
+malloc-posix    [test -n "$GLOB_H"]
 
 configure.ac:
 gl_GLOB
--- modules/grantpt.orig        Mon May  2 01:51:10 2011
+++ modules/grantpt     Sun May  1 19:58:13 2011
@@ -8,9 +8,9 @@
 Depends-on:
 stdlib
 extensions
-pt_chown
-waitpid
-configmake
+pt_chown        [test $HAVE_GRANTPT = 0]
+waitpid         [test $HAVE_GRANTPT = 0]
+configmake      [test $HAVE_GRANTPT = 0]
 
 configure.ac:
 gl_FUNC_GRANTPT
--- modules/iconv_open.orig     Mon May  2 01:51:10 2011
+++ modules/iconv_open  Sun May  1 20:00:09 2011
@@ -14,8 +14,8 @@
 gperf
 iconv-h
 iconv
-c-ctype
-c-strcase
+c-ctype         [test $REPLACE_ICONV_OPEN = 1]
+c-strcase       [test $REPLACE_ICONV_OPEN = 1]
 
 configure.ac:
 gl_FUNC_ICONV_OPEN
--- modules/iconv_open-utf.orig Mon May  2 01:51:10 2011
+++ modules/iconv_open-utf      Sun May  1 20:01:57 2011
@@ -8,9 +8,9 @@
 
 Depends-on:
 iconv_open
-stdint
-unistr/u8-mbtoucr
-unistr/u8-uctomb
+stdint            [test $REPLACE_ICONV_UTF = 1]
+unistr/u8-mbtoucr [test $REPLACE_ICONV_UTF = 1]
+unistr/u8-uctomb  [test $REPLACE_ICONV_UTF = 1]
 
 configure.ac:
 gl_FUNC_ICONV_OPEN_UTF
--- modules/inet_ntop.orig      Mon May  2 01:51:10 2011
+++ modules/inet_ntop   Sun May  1 23:52:52 2011
@@ -6,11 +6,11 @@
 m4/inet_ntop.m4
 
 Depends-on:
-sys_socket
 arpa_inet
-errno
-netinet_in
 extensions
+sys_socket      [test "$ac_cv_search_inet_ntop" = no && test 
$ac_cv_func_inet_ntop = no]
+errno           [test "$ac_cv_search_inet_ntop" = no && test 
$ac_cv_func_inet_ntop = no]
+netinet_in      [test "$ac_cv_search_inet_ntop" = no && test 
$ac_cv_func_inet_ntop = no]
 
 configure.ac:
 gl_FUNC_INET_NTOP
--- modules/inet_pton.orig      Mon May  2 01:51:10 2011
+++ modules/inet_pton   Sun May  1 20:06:27 2011
@@ -6,12 +6,12 @@
 m4/inet_pton.m4
 
 Depends-on:
-c-ctype
-sys_socket
 arpa_inet
-errno
-netinet_in
 extensions
+c-ctype         [test "$ac_cv_search_inet_pton" = no && test 
$ac_cv_func_inet_pton = no]
+sys_socket      [test "$ac_cv_search_inet_pton" = no && test 
$ac_cv_func_inet_pton = no]
+errno           [test "$ac_cv_search_inet_pton" = no && test 
$ac_cv_func_inet_pton = no]
+netinet_in      [test "$ac_cv_search_inet_pton" = no && test 
$ac_cv_func_inet_pton = no]
 
 configure.ac:
 gl_FUNC_INET_PTON
--- modules/ioctl.orig  Mon May  2 01:51:10 2011
+++ modules/ioctl       Sun May  1 20:09:45 2011
@@ -8,9 +8,9 @@
 
 Depends-on:
 sys_ioctl
-sys_socket
-errno
-fd-hook
+sys_socket      [test "$ac_cv_header_winsock2_h" = yes || test $REPLACE_IOCTL 
= 1]
+errno           [test "$ac_cv_header_winsock2_h" = yes || test $REPLACE_IOCTL 
= 1]
+fd-hook         [test "$ac_cv_header_winsock2_h" = yes || test $REPLACE_IOCTL 
= 1]
 
 configure.ac:
 gl_FUNC_IOCTL
--- modules/isapipe.orig        Mon May  2 01:51:10 2011
+++ modules/isapipe     Sun May  1 23:53:46 2011
@@ -7,9 +7,9 @@
 m4/isapipe.m4
 
 Depends-on:
-stdbool
-sys_stat
-unistd
+stdbool         [test $ac_cv_func_isapipe = no]
+sys_stat        [test $ac_cv_func_isapipe = no]
+unistd          [test $ac_cv_func_isapipe = no]
 
 configure.ac:
 gl_ISAPIPE
--- modules/isfinite.orig       Mon May  2 01:51:10 2011
+++ modules/isfinite    Sun May  1 20:11:16 2011
@@ -7,11 +7,11 @@
 m4/check-math-lib.m4
 
 Depends-on:
-isnanf-nolibm
-isnand-nolibm
-isnanl-nolibm
 math
 extensions
+isnanf-nolibm   [test $REPLACE_ISFINITE = 1]
+isnand-nolibm   [test $REPLACE_ISFINITE = 1]
+isnanl-nolibm   [test $REPLACE_ISFINITE = 1]
 
 configure.ac:
 gl_ISFINITE
--- modules/isinf.orig  Mon May  2 01:51:10 2011
+++ modules/isinf       Sun May  1 23:28:19 2011
@@ -7,9 +7,9 @@
 m4/check-math-lib.m4
 
 Depends-on:
-float
 math
 extensions
+float           [test $REPLACE_ISINF = 1]
 
 configure.ac:
 gl_ISINF
--- modules/lchown.orig Mon May  2 01:51:10 2011
+++ modules/lchown      Sun May  1 20:13:44 2011
@@ -6,12 +6,12 @@
 m4/lchown.m4
 
 Depends-on:
-chown
-errno
-lstat
-stdbool
-sys_stat
 unistd
+chown           [test $HAVE_LCHOWN = 0 || test $REPLACE_LCHOWN = 1]
+errno           [test $HAVE_LCHOWN = 0 || test $REPLACE_LCHOWN = 1]
+lstat           [test $HAVE_LCHOWN = 0 || test $REPLACE_LCHOWN = 1]
+stdbool         [test $HAVE_LCHOWN = 0 || test $REPLACE_LCHOWN = 1]
+sys_stat        [test $HAVE_LCHOWN = 0 || test $REPLACE_LCHOWN = 1]
 
 configure.ac:
 gl_FUNC_LCHOWN
--- modules/ldexpl.orig Mon May  2 01:51:10 2011
+++ modules/ldexpl      Sun May  1 20:14:29 2011
@@ -7,8 +7,8 @@
 
 Depends-on:
 math
-isnanl
-fpucw
+isnanl          [test $HAVE_DECL_LDEXPL = 0 || test $gl_func_ldexpl = no]
+fpucw           [test $HAVE_DECL_LDEXPL = 0 || test $gl_func_ldexpl = no]
 
 configure.ac:
 gl_FUNC_LDEXPL
--- modules/link.orig   Mon May  2 01:51:10 2011
+++ modules/link        Sun May  1 20:21:41 2011
@@ -6,10 +6,10 @@
 m4/link.m4
 
 Depends-on:
-stat
-strdup-posix
-sys_stat
 unistd
+stat            [test $HAVE_LINK = 0 || test $REPLACE_LINK = 1]
+strdup-posix    [test $HAVE_LINK = 0 || test $REPLACE_LINK = 1]
+sys_stat        [test $HAVE_LINK = 0 || test $REPLACE_LINK = 1]
 
 configure.ac:
 gl_FUNC_LINK
--- modules/linkat.orig Mon May  2 01:51:10 2011
+++ modules/linkat      Sun May  1 20:23:33 2011
@@ -7,24 +7,24 @@
 m4/linkat.m4
 
 Depends-on:
-areadlink
-areadlinkat
-dirname-lgpl
-errno
-extensions
-fcntl-h
-filenamecat-lgpl
-getcwd-lgpl
-openat
-link
-link-follow
-lstat
-readlink
-same-inode
-stpcpy
-symlink
-symlinkat
 unistd
+extensions
+areadlink        [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
+areadlinkat      [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
+dirname-lgpl     [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
+errno            [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
+fcntl-h          [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
+filenamecat-lgpl [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
+getcwd-lgpl      [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
+openat           [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
+link             [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
+link-follow      [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
+lstat            [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
+readlink         [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
+same-inode       [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
+stpcpy           [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
+symlink          [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
+symlinkat        [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
 
 configure.ac:
 gl_FUNC_LINKAT
--- modules/listen.orig Mon May  2 01:51:10 2011
+++ modules/listen      Sun May  1 22:10:25 2011
@@ -7,7 +7,7 @@
 
 Depends-on:
 sys_socket
-errno
+errno           [test "$ac_cv_header_winsock2_h" = yes]
 
 configure.ac:
 AC_REQUIRE([gl_HEADER_SYS_SOCKET])
--- modules/logl.orig   Mon May  2 01:51:10 2011
+++ modules/logl        Sun May  1 20:24:08 2011
@@ -8,9 +8,9 @@
 Depends-on:
 math
 extensions
-frexpl
-isnanl
-floorl
+frexpl          [test $HAVE_LOGL = 0]
+isnanl          [test $HAVE_LOGL = 0]
+floorl          [test $HAVE_LOGL = 0]
 
 configure.ac:
 gl_FUNC_LOGL
--- modules/lstat.orig  Mon May  2 01:51:10 2011
+++ modules/lstat       Sun May  1 20:25:59 2011
@@ -6,9 +6,9 @@
 m4/lstat.m4
 
 Depends-on:
-dosname
-stat
 sys_stat
+dosname         [test $REPLACE_LSTAT = 1]
+stat            [test $REPLACE_LSTAT = 1]
 
 configure.ac:
 gl_FUNC_LSTAT
--- modules/mbrlen.orig Mon May  2 01:51:10 2011
+++ modules/mbrlen      Sun May  1 20:26:33 2011
@@ -8,8 +8,8 @@
 
 Depends-on:
 wchar
-mbrtowc
 extensions
+mbrtowc         [test $HAVE_MBRLEN = 0 || test $REPLACE_MBRLEN = 1]
 
 configure.ac:
 gl_FUNC_MBRLEN
--- modules/mbrtowc.orig        Mon May  2 01:51:10 2011
+++ modules/mbrtowc     Sun May  1 20:27:29 2011
@@ -12,11 +12,11 @@
 
 Depends-on:
 wchar
-mbsinit
-localcharset
-streq
-verify
 extensions
+mbsinit         [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1]
+localcharset    [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1]
+streq           [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1]
+verify          [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1]
 
 configure.ac:
 gl_FUNC_MBRTOWC
--- modules/mbsinit.orig        Mon May  2 01:51:10 2011
+++ modules/mbsinit     Sun May  1 20:27:58 2011
@@ -8,9 +8,9 @@
 
 Depends-on:
 wchar
-mbrtowc
-verify
 extensions
+mbrtowc         [test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1]
+verify          [test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1]
 
 configure.ac:
 gl_FUNC_MBSINIT
--- modules/mbsnrtowcs.orig     Mon May  2 01:51:10 2011
+++ modules/mbsnrtowcs  Sun May  1 20:28:31 2011
@@ -9,11 +9,11 @@
 m4/mbstate_t.m4
 
 Depends-on:
-extensions
 wchar
-mbrtowc
-minmax
-strnlen1
+extensions
+mbrtowc         [test $HAVE_MBSNRTOWCS = 0 || test $REPLACE_MBSNRTOWCS = 1]
+minmax          [test $HAVE_MBSNRTOWCS = 0 || test $REPLACE_MBSNRTOWCS = 1]
+strnlen1        [test $HAVE_MBSNRTOWCS = 0 || test $REPLACE_MBSNRTOWCS = 1]
 
 configure.ac:
 gl_FUNC_MBSNRTOWCS
--- modules/mbsrtowcs.orig      Mon May  2 01:51:10 2011
+++ modules/mbsrtowcs   Sun May  1 20:29:02 2011
@@ -14,9 +14,9 @@
 
 Depends-on:
 wchar
-mbrtowc
-strnlen1
 extensions
+mbrtowc         [test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1]
+strnlen1        [test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1]
 
 configure.ac:
 gl_FUNC_MBSRTOWCS
--- modules/mbtowc.orig Mon May  2 01:51:10 2011
+++ modules/mbtowc      Sun May  1 20:29:45 2011
@@ -8,8 +8,8 @@
 
 Depends-on:
 stdlib
-mbrtowc
-wchar
+mbrtowc         [test $REPLACE_MBTOWC = 1]
+wchar           [test $REPLACE_MBTOWC = 1]
 
 configure.ac:
 gl_FUNC_MBTOWC
--- modules/memcmp.orig Mon May  2 01:51:10 2011
+++ modules/memcmp      Sun May  1 23:29:33 2011
@@ -12,7 +12,7 @@
 m4/memcmp.m4
 
 Depends-on:
-stdint
+stdint          [test $ac_cv_func_memcmp_working = no]
 
 configure.ac:
 gl_FUNC_MEMCMP
--- modules/mkdir.orig  Mon May  2 01:51:10 2011
+++ modules/mkdir       Sun May  1 20:34:31 2011
@@ -6,8 +6,8 @@
 m4/mkdir.m4
 
 Depends-on:
-dirname-lgpl
 sys_stat
+dirname-lgpl    [test $REPLACE_MKDIR = 1]
 
 configure.ac:
 gl_FUNC_MKDIR
--- modules/mkdtemp.orig        Mon May  2 01:51:10 2011
+++ modules/mkdtemp     Sun May  1 20:35:09 2011
@@ -6,9 +6,9 @@
 m4/mkdtemp.m4
 
 Depends-on:
-stdint
 stdlib
-tempname
+stdint          [test $HAVE_MKDTEMP = 0]
+tempname        [test $HAVE_MKDTEMP = 0]
 
 configure.ac:
 gt_FUNC_MKDTEMP
--- modules/mkfifo.orig Mon May  2 01:51:10 2011
+++ modules/mkfifo      Sun May  1 20:36:07 2011
@@ -6,8 +6,8 @@
 m4/mkfifo.m4
 
 Depends-on:
-stat
 sys_stat
+stat            [test $HAVE_MKFIFO = 0 || test $REPLACE_MKFIFO = 1]
 
 configure.ac:
 gl_FUNC_MKFIFO
--- modules/mkfifoat.orig       Mon May  2 01:51:10 2011
+++ modules/mkfifoat    Sun May  1 20:57:20 2011
@@ -7,12 +7,12 @@
 m4/mkfifoat.m4
 
 Depends-on:
+sys_stat
 extensions
 fcntl-h
-mkfifo
-mknod
-openat
-sys_stat
+mkfifo          [test $HAVE_MKFIFOAT = 0]
+mknod           [test $HAVE_MKNODAT = 0]
+openat          [test $HAVE_MKFIFOAT = 0 || test $HAVE_MKNODAT = 0]
 
 configure.ac:
 gl_FUNC_MKFIFOAT
--- modules/mknod.orig  Mon May  2 01:51:10 2011
+++ modules/mknod       Sun May  1 20:58:16 2011
@@ -6,10 +6,10 @@
 m4/mknod.m4
 
 Depends-on:
-mkfifo
-stat
 sys_stat
 extensions
+mkfifo          [test $HAVE_MKNOD = 0 || test $REPLACE_MKNOD = 1]
+stat            [test $HAVE_MKNOD = 0 || test $REPLACE_MKNOD = 1]
 
 configure.ac:
 gl_FUNC_MKNOD
--- modules/mkostemp.orig       Mon May  2 01:51:10 2011
+++ modules/mkostemp    Sun May  1 23:30:42 2011
@@ -7,9 +7,9 @@
 m4/mkostemp.m4
 
 Depends-on:
-extensions
 stdlib
-tempname
+extensions
+tempname        [test $HAVE_MKOSTEMP = 0]
 
 configure.ac:
 gl_FUNC_MKOSTEMP
--- modules/mkostemps.orig      Mon May  2 01:51:10 2011
+++ modules/mkostemps   Sun May  1 23:31:05 2011
@@ -7,9 +7,9 @@
 m4/mkostemps.m4
 
 Depends-on:
-extensions
 stdlib
-tempname
+extensions
+tempname        [test $HAVE_MKOSTEMPS = 0]
 
 configure.ac:
 gl_FUNC_MKOSTEMPS
--- modules/mkstemp.orig        Mon May  2 01:51:10 2011
+++ modules/mkstemp     Sun May  1 20:58:54 2011
@@ -6,9 +6,9 @@
 m4/mkstemp.m4
 
 Depends-on:
-extensions
 stdlib
-tempname
+extensions
+tempname        [test $HAVE_MKSTEMP = 0 || test $REPLACE_MKSTEMP = 1]
 
 configure.ac:
 gl_FUNC_MKSTEMP
--- modules/mkstemps.orig       Mon May  2 01:51:10 2011
+++ modules/mkstemps    Sun May  1 23:31:29 2011
@@ -6,9 +6,9 @@
 m4/mkstemps.m4
 
 Depends-on:
-extensions
 stdlib
-tempname
+extensions
+tempname        [test $HAVE_MKSTEMPS = 0]
 
 configure.ac:
 gl_FUNC_MKSTEMPS
--- modules/mktime.orig Mon May  2 01:51:10 2011
+++ modules/mktime      Sun May  1 21:00:14 2011
@@ -8,7 +8,7 @@
 
 Depends-on:
 multiarch
-time_r
+time_r          [test $REPLACE_MKTIME = 1]
 
 configure.ac:
 gl_FUNC_MKTIME
--- modules/nanosleep.orig      Mon May  2 01:51:10 2011
+++ modules/nanosleep   Sun May  1 21:02:35 2011
@@ -6,16 +6,16 @@
 m4/nanosleep.m4
 
 Depends-on:
+time
 extensions
-intprops
 multiarch
-select
-sigaction
-stdbool
-sys_select
-sys_time
-time
-verify
+intprops        [test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1]
+select          [test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1]
+sigaction       [test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1]
+stdbool         [test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1]
+sys_select      [test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1]
+sys_time        [test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1]
+verify          [test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1]
 
 configure.ac:
 gl_FUNC_NANOSLEEP
--- modules/open.orig   Mon May  2 01:51:10 2011
+++ modules/open        Sun May  1 21:03:36 2011
@@ -8,7 +8,7 @@
 
 Depends-on:
 fcntl-h
-stat
+stat            [test $REPLACE_OPEN = 1]
 
 configure.ac:
 gl_FUNC_OPEN
--- modules/openat.orig Mon May  2 01:51:10 2011
+++ modules/openat      Sun May  1 21:10:08 2011
@@ -24,18 +24,18 @@
 fdopendir
 gettext-h
 intprops
-lchown
+lchown          [test $HAVE_FCHOWNAT = 0 || test $REPLACE_FCHOWNAT = 1]
 lstat
-mkdir
+mkdir           [test $HAVE_MKDIRAT = 0]
 open
 openat-die
-rmdir
+rmdir           [test $REPLACE_UNLINKAT = 1]
 same-inode
 save-cwd
 stdbool
 sys_stat
 unistd
-unlink
+unlink          [test $REPLACE_UNLINKAT = 1]
 
 configure.ac:
 gl_FUNC_OPENAT
--- modules/perror.orig Mon May  2 01:51:10 2011
+++ modules/perror      Sun May  1 21:10:39 2011
@@ -7,8 +7,8 @@
 
 Depends-on:
 stdio
-errno
-strerror
+errno           [test $REPLACE_PERROR = 1]
+strerror        [test $REPLACE_PERROR = 1]
 
 configure.ac:
 gl_FUNC_PERROR
--- modules/poll.orig   Mon May  2 01:51:10 2011
+++ modules/poll        Sun May  1 21:11:27 2011
@@ -7,11 +7,11 @@
 
 Depends-on:
 poll-h
-alloca
-select
-sys_select
-sys_time
-errno
+alloca          [test $HAVE_POLL = 0 || test $REPLACE_POLL = 1]
+select          [test $HAVE_POLL = 0 || test $REPLACE_POLL = 1]
+sys_select      [test $HAVE_POLL = 0 || test $REPLACE_POLL = 1]
+sys_time        [test $HAVE_POLL = 0 || test $REPLACE_POLL = 1]
+errno           [test $HAVE_POLL = 0 || test $REPLACE_POLL = 1]
 
 configure.ac:
 gl_FUNC_POLL
--- modules/popen.orig  Mon May  2 01:51:10 2011
+++ modules/popen       Sun May  1 21:12:00 2011
@@ -6,8 +6,8 @@
 m4/popen.m4
 
 Depends-on:
-open
 stdio
+open            [test $REPLACE_POPEN = 1]
 
 configure.ac:
 gl_FUNC_POPEN
--- modules/posix_spawn.orig    Mon May  2 01:51:10 2011
+++ modules/posix_spawn Sun May  1 21:12:40 2011
@@ -7,7 +7,7 @@
 
 Depends-on:
 spawn
-posix_spawn-internal
+posix_spawn-internal [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN 
= 1]
 
 configure.ac:
 gl_POSIX_SPAWN
--- modules/posix_spawn_file_actions_addclose.orig      Mon May  2 01:51:10 2011
+++ modules/posix_spawn_file_actions_addclose   Sun May  1 21:13:49 2011
@@ -9,7 +9,7 @@
 
 Depends-on:
 spawn
-getdtablesize
+getdtablesize   [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1]
 
 configure.ac:
 gl_POSIX_SPAWN
--- modules/posix_spawn_file_actions_adddup2.orig       Mon May  2 01:51:10 2011
+++ modules/posix_spawn_file_actions_adddup2    Sun May  1 21:13:53 2011
@@ -9,7 +9,7 @@
 
 Depends-on:
 spawn
-getdtablesize
+getdtablesize   [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1]
 
 configure.ac:
 gl_POSIX_SPAWN
--- modules/posix_spawn_file_actions_addopen.orig       Mon May  2 01:51:10 2011
+++ modules/posix_spawn_file_actions_addopen    Sun May  1 21:13:56 2011
@@ -9,7 +9,7 @@
 
 Depends-on:
 spawn
-getdtablesize
+getdtablesize   [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1]
 
 configure.ac:
 gl_POSIX_SPAWN
--- modules/posix_spawnp.orig   Mon May  2 01:51:10 2011
+++ modules/posix_spawnp        Sun May  1 21:13:08 2011
@@ -7,7 +7,7 @@
 
 Depends-on:
 spawn
-posix_spawn-internal
+posix_spawn-internal [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN 
= 1]
 
 configure.ac:
 gl_POSIX_SPAWN
--- modules/pread.orig  Mon May  2 01:51:10 2011
+++ modules/pread       Sun May  1 21:14:40 2011
@@ -6,10 +6,10 @@
 m4/pread.m4
 
 Depends-on:
-extensions
-lseek
-read
 unistd
+extensions
+lseek           [test $HAVE_PREAD = 0 || test $REPLACE_PREAD = 1]
+read            [test $HAVE_PREAD = 0 || test $REPLACE_PREAD = 1]
 
 configure.ac:
 gl_FUNC_PREAD
--- modules/printf-posix.orig   Mon May  2 01:51:10 2011
+++ modules/printf-posix        Sun May  1 21:16:24 2011
@@ -15,8 +15,8 @@
 
 Depends-on:
 stdio
-vfprintf-posix
 printf-safe
+vfprintf-posix  [test $REPLACE_PRINTF = 1]
 
 configure.ac:
 gl_FUNC_PRINTF_POSIX
--- modules/ptsname.orig        Mon May  2 01:51:10 2011
+++ modules/ptsname     Sun May  1 21:17:12 2011
@@ -8,7 +8,7 @@
 Depends-on:
 stdlib
 extensions
-ttyname_r
+ttyname_r       [test $HAVE_PTSNAME = 0]
 
 configure.ac:
 gl_FUNC_PTSNAME
--- modules/putenv.orig Mon May  2 01:51:10 2011
+++ modules/putenv      Sun May  1 23:33:01 2011
@@ -7,7 +7,7 @@
 
 Depends-on:
 stdlib
-malloc-posix
+malloc-posix    [test $REPLACE_PUTENV = 1]
 
 configure.ac:
 gl_FUNC_PUTENV
--- modules/pwrite.orig Mon May  2 01:51:10 2011
+++ modules/pwrite      Sun May  1 21:17:42 2011
@@ -6,10 +6,10 @@
 m4/pwrite.m4
 
 Depends-on:
-extensions
-lseek
 unistd
-write
+extensions
+lseek           [test $HAVE_PWRITE = 0 || test $REPLACE_PWRITE = 1]
+write           [test $HAVE_PWRITE = 0 || test $REPLACE_PWRITE = 1]
 
 configure.ac:
 gl_FUNC_PWRITE
--- modules/readline.orig       Mon May  2 01:51:10 2011
+++ modules/readline    Sun May  1 23:35:00 2011
@@ -7,8 +7,8 @@
 m4/readline.m4
 
 Depends-on:
-getline
 havelib
+getline         [test "$gl_cv_lib_readline" = no]
 
 configure.ac:
 gl_FUNC_READLINE
--- modules/readlink.orig       Mon May  2 01:51:10 2011
+++ modules/readlink    Sun May  1 21:18:38 2011
@@ -6,8 +6,8 @@
 m4/readlink.m4
 
 Depends-on:
-stat
 unistd
+stat            [test $HAVE_READLINK = 0 || test $REPLACE_READLINK = 1]
 
 configure.ac:
 gl_FUNC_READLINK
--- modules/readlinkat.orig     Mon May  2 01:51:10 2011
+++ modules/readlinkat  Sun May  1 21:19:26 2011
@@ -6,11 +6,11 @@
 m4/readlinkat.m4
 
 Depends-on:
+unistd
 extensions
 fcntl-h
-openat
-readlink
-unistd
+openat          [test $HAVE_READLINKAT = 0]
+readlink        [test $HAVE_READLINKAT = 0]
 
 configure.ac:
 gl_FUNC_READLINKAT
--- modules/recv.orig   Mon May  2 01:51:10 2011
+++ modules/recv        Sun May  1 22:10:28 2011
@@ -7,7 +7,7 @@
 
 Depends-on:
 sys_socket
-errno
+errno           [test "$ac_cv_header_winsock2_h" = yes]
 
 configure.ac:
 AC_REQUIRE([gl_HEADER_SYS_SOCKET])
--- modules/recvfrom.orig       Mon May  2 01:51:10 2011
+++ modules/recvfrom    Sun May  1 21:19:59 2011
@@ -7,8 +7,8 @@
 
 Depends-on:
 sys_socket
-errno
-getpeername
+errno           [test "$ac_cv_header_winsock2_h" = yes]
+getpeername     [test "$ac_cv_header_winsock2_h" = yes]
 
 configure.ac:
 AC_REQUIRE([gl_HEADER_SYS_SOCKET])
--- modules/regex.orig  Mon May  2 01:51:10 2011
+++ modules/regex       Mon May  2 00:32:52 2011
@@ -12,23 +12,23 @@
 m4/mbstate_t.m4
 
 Depends-on:
-alloca-opt
-btowc
 extensions
-gettext-h
-localcharset
-malloc-gnu
-memcmp
-memmove
-mbrtowc
-mbsinit
-nl_langinfo
-stdbool
-stdint
 ssize_t
-wchar
-wcrtomb
-wctype-h
+alloca-opt      [test $ac_use_included_regex = yes]
+btowc           [test $ac_use_included_regex = yes]
+gettext-h       [test $ac_use_included_regex = yes]
+localcharset    [test $ac_use_included_regex = yes]
+malloc-gnu      [test $ac_use_included_regex = yes]
+memcmp          [test $ac_use_included_regex = yes]
+memmove         [test $ac_use_included_regex = yes]
+mbrtowc         [test $ac_use_included_regex = yes]
+mbsinit         [test $ac_use_included_regex = yes]
+nl_langinfo     [test $ac_use_included_regex = yes]
+stdbool         [test $ac_use_included_regex = yes]
+stdint          [test $ac_use_included_regex = yes]
+wchar           [test $ac_use_included_regex = yes]
+wcrtomb         [test $ac_use_included_regex = yes]
+wctype-h        [test $ac_use_included_regex = yes]
 
 configure.ac:
 gl_REGEX
--- modules/remove.orig Mon May  2 01:51:10 2011
+++ modules/remove      Sun May  1 21:23:19 2011
@@ -6,9 +6,9 @@
 m4/remove.m4
 
 Depends-on:
-rmdir
 stdio
-unlink
+rmdir           [test $REPLACE_REMOVE = 1]
+unlink          [test $REPLACE_REMOVE = 1]
 
 configure.ac:
 gl_FUNC_REMOVE
--- modules/rename.orig Mon May  2 01:51:10 2011
+++ modules/rename      Sun May  1 21:24:09 2011
@@ -6,14 +6,14 @@
 m4/rename.m4
 
 Depends-on:
-canonicalize-lgpl
-dirname-lgpl
-lstat
-rmdir
-same-inode
-stdbool
 stdio
-strdup
+canonicalize-lgpl [test $REPLACE_RENAME = 1]
+dirname-lgpl      [test $REPLACE_RENAME = 1]
+lstat             [test $REPLACE_RENAME = 1]
+rmdir             [test $REPLACE_RENAME = 1]
+same-inode        [test $REPLACE_RENAME = 1]
+stdbool           [test $REPLACE_RENAME = 1]
+strdup            [test $REPLACE_RENAME = 1]
 
 configure.ac:
 gl_FUNC_RENAME
--- modules/renameat.orig       Mon May  2 01:51:11 2011
+++ modules/renameat    Sun May  1 21:25:26 2011
@@ -7,15 +7,15 @@
 m4/renameat.m4
 
 Depends-on:
+stdio
 extensions
 fcntl-h
-filenamecat-lgpl
-getcwd-lgpl
-openat
-rename
-same-inode
-stdio
-stpcpy
+filenamecat-lgpl [test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1]
+getcwd-lgpl      [test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1]
+openat           [test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1]
+rename           [test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1]
+same-inode       [test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1]
+stpcpy           [test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1]
 
 configure.ac:
 gl_FUNC_RENAMEAT
--- modules/rmdir.orig  Mon May  2 01:51:11 2011
+++ modules/rmdir       Sun May  1 21:26:08 2011
@@ -6,9 +6,9 @@
 m4/rmdir.m4
 
 Depends-on:
-dosname
-sys_stat
 unistd
+dosname         [test $REPLACE_RMDIR = 1]
+sys_stat        [test $REPLACE_RMDIR = 1]
 
 configure.ac:
 gl_FUNC_RMDIR
--- modules/round.orig  Mon May  2 01:51:11 2011
+++ modules/round       Sun May  1 21:27:21 2011
@@ -9,10 +9,10 @@
 m4/ceil.m4
 
 Depends-on:
-float
-floor
 math
 extensions
+float           [test $HAVE_DECL_ROUND = 0 || test $REPLACE_ROUND = 1]
+floor           [test $HAVE_DECL_ROUND = 0 || test $REPLACE_ROUND = 1]
 
 configure.ac:
 gl_FUNC_ROUND
--- modules/roundf.orig Mon May  2 01:51:11 2011
+++ modules/roundf      Sun May  1 23:36:00 2011
@@ -10,9 +10,9 @@
 m4/ceilf.m4
 
 Depends-on:
-float
 math
 extensions
+float           [test $HAVE_DECL_ROUNDF = 0 || test $REPLACE_ROUNDF = 1]
 
 configure.ac:
 gl_FUNC_ROUNDF
--- modules/roundl.orig Mon May  2 01:51:11 2011
+++ modules/roundl      Sun May  1 23:36:45 2011
@@ -10,9 +10,9 @@
 m4/ceill.m4
 
 Depends-on:
-float
 math
 extensions
+float           [test $HAVE_DECL_ROUNDL = 0 || test $REPLACE_ROUNDL = 1]
 
 configure.ac:
 gl_FUNC_ROUNDL
--- modules/rpmatch.orig        Mon May  2 01:51:11 2011
+++ modules/rpmatch     Sun May  1 23:48:53 2011
@@ -8,10 +8,10 @@
 Depends-on:
 stdlib
 extensions
-stdbool
-gettext-h
-regex
-strdup
+stdbool         [test $HAVE_RPMATCH = 0]
+gettext-h       [test $HAVE_RPMATCH = 0]
+regex           [test $HAVE_RPMATCH = 0]
+strdup          [test $HAVE_RPMATCH = 0]
 
 configure.ac:
 gl_FUNC_RPMATCH
--- modules/select.orig Mon May  2 01:51:11 2011
+++ modules/select      Sun May  1 21:28:14 2011
@@ -6,9 +6,9 @@
 m4/select.m4
 
 Depends-on:
-alloca
-sockets
 sys_select
+alloca          [test "$ac_cv_header_winsock2_h" = yes || test $REPLACE_SELECT 
= 1]
+sockets         [test "$ac_cv_header_winsock2_h" = yes || test $REPLACE_SELECT 
= 1]
 
 configure.ac:
 gl_FUNC_SELECT
--- modules/send.orig   Mon May  2 01:51:11 2011
+++ modules/send        Sun May  1 22:10:30 2011
@@ -7,7 +7,7 @@
 
 Depends-on:
 sys_socket
-errno
+errno           [test "$ac_cv_header_winsock2_h" = yes]
 
 configure.ac:
 AC_REQUIRE([gl_HEADER_SYS_SOCKET])
--- modules/sendto.orig Mon May  2 01:51:11 2011
+++ modules/sendto      Sun May  1 22:10:36 2011
@@ -7,7 +7,7 @@
 
 Depends-on:
 sys_socket
-errno
+errno           [test "$ac_cv_header_winsock2_h" = yes]
 
 configure.ac:
 AC_REQUIRE([gl_HEADER_SYS_SOCKET])
--- modules/setenv.orig Mon May  2 01:51:11 2011
+++ modules/setenv      Sun May  1 21:30:01 2011
@@ -7,10 +7,10 @@
 
 Depends-on:
 stdlib
-malloca
-alloca-opt
-unistd
-environ
+malloca         [test $HAVE_SETENV = 0 || test $REPLACE_SETENV = 1]
+alloca-opt      [test $HAVE_SETENV = 0 || test $REPLACE_SETENV = 1]
+unistd          [test $HAVE_SETENV = 0 || test $REPLACE_SETENV = 1]
+environ         [test $HAVE_SETENV = 0 || test $REPLACE_SETENV = 1]
 
 configure.ac:
 gl_FUNC_SETENV
--- modules/setlocale.orig      Mon May  2 01:51:11 2011
+++ modules/setlocale   Sun May  1 21:31:56 2011
@@ -7,7 +7,7 @@
 
 Depends-on:
 locale
-localename
+localename      [test $REPLACE_SETLOCALE = 1]
 
 configure.ac:
 gl_FUNC_SETLOCALE
--- modules/setsockopt.orig     Mon May  2 01:51:11 2011
+++ modules/setsockopt  Sun May  1 22:10:43 2011
@@ -7,8 +7,8 @@
 
 Depends-on:
 sys_socket
-sys_time
-errno
+sys_time        [test "$ac_cv_header_winsock2_h" = yes]
+errno           [test "$ac_cv_header_winsock2_h" = yes]
 
 configure.ac:
 AC_REQUIRE([gl_HEADER_SYS_SOCKET])
--- modules/shutdown.orig       Mon May  2 01:51:11 2011
+++ modules/shutdown    Sun May  1 22:10:47 2011
@@ -7,7 +7,7 @@
 
 Depends-on:
 sys_socket
-errno
+errno           [test "$ac_cv_header_winsock2_h" = yes]
 
 configure.ac:
 AC_REQUIRE([gl_HEADER_SYS_SOCKET])
--- modules/sigaction.orig      Mon May  2 01:51:11 2011
+++ modules/sigaction   Sun May  1 21:47:30 2011
@@ -8,7 +8,7 @@
 
 Depends-on:
 signal
-sigprocmask
+sigprocmask     [test $HAVE_SIGACTION = 0]
 
 configure.ac:
 gl_SIGACTION
--- modules/signbit.orig        Mon May  2 01:51:11 2011
+++ modules/signbit     Sun May  1 21:49:01 2011
@@ -9,13 +9,13 @@
 m4/signbit.m4
 
 Depends-on:
-float
 math
-isnanf-nolibm
-isnand-nolibm
-isnanl-nolibm
-fpieee
-memcmp
+float           [test $REPLACE_SIGNBIT = 1]
+isnanf-nolibm   [test $REPLACE_SIGNBIT = 1]
+isnand-nolibm   [test $REPLACE_SIGNBIT = 1]
+isnanl-nolibm   [test $REPLACE_SIGNBIT = 1]
+fpieee          [test $REPLACE_SIGNBIT = 1]
+memcmp          [test $REPLACE_SIGNBIT = 1]
 
 configure.ac:
 gl_SIGNBIT
--- modules/sigprocmask.orig    Mon May  2 01:51:11 2011
+++ modules/sigprocmask Sun May  1 21:49:58 2011
@@ -7,8 +7,8 @@
 
 Depends-on:
 signal
-stdint
-raise
+stdint          [test $HAVE_POSIX_SIGNALBLOCKING = 0]
+raise           [test $HAVE_POSIX_SIGNALBLOCKING = 0]
 
 configure.ac:
 gl_SIGNALBLOCKING
--- modules/sinl.orig   Mon May  2 01:51:11 2011
+++ modules/sinl        Sun May  1 21:50:56 2011
@@ -11,10 +11,10 @@
 Depends-on:
 math
 extensions
-float
-isnanl
-floor
-floorl
+float           [test $HAVE_SINL = 0]
+isnanl          [test $HAVE_SINL = 0]
+floor           [test $HAVE_SINL = 0]
+floorl          [test $HAVE_SINL = 0]
 
 configure.ac:
 gl_FUNC_SINL
--- modules/sleep.orig  Mon May  2 01:51:11 2011
+++ modules/sleep       Sun May  1 21:51:39 2011
@@ -6,9 +6,9 @@
 m4/sleep.m4
 
 Depends-on:
-stdint
 unistd
-verify
+stdint          [test $HAVE_SLEEP = 0 || test $REPLACE_SLEEP = 1]
+verify          [test $HAVE_SLEEP = 0 || test $REPLACE_SLEEP = 1]
 
 configure.ac:
 gl_FUNC_SLEEP
--- modules/snprintf.orig       Mon May  2 01:51:11 2011
+++ modules/snprintf    Sun May  1 21:54:13 2011
@@ -8,8 +8,8 @@
 
 Depends-on:
 stdio
-vasnprintf
-errno
+vasnprintf      [test $ac_cv_func_snprintf = no || test $REPLACE_SNPRINTF = 1]
+errno           [test $ac_cv_func_snprintf = no || test $REPLACE_SNPRINTF = 1]
 
 configure.ac:
 gl_FUNC_SNPRINTF
--- modules/snprintf-posix.orig Mon May  2 01:51:11 2011
+++ modules/snprintf-posix      Sun May  1 21:54:54 2011
@@ -14,18 +14,18 @@
 
 Depends-on:
 snprintf
-vasnprintf
-isnand-nolibm
-isnanl-nolibm
-frexp-nolibm
-frexpl-nolibm
-printf-frexp
-printf-frexpl
-signbit
-fpucw
 nocrash
 printf-safe
 multiarch
+vasnprintf      [test $ac_cv_func_snprintf = no || test $REPLACE_SNPRINTF = 1]
+isnand-nolibm   [test $ac_cv_func_snprintf = no || test $REPLACE_SNPRINTF = 1]
+isnanl-nolibm   [test $ac_cv_func_snprintf = no || test $REPLACE_SNPRINTF = 1]
+frexp-nolibm    [test $ac_cv_func_snprintf = no || test $REPLACE_SNPRINTF = 1]
+frexpl-nolibm   [test $ac_cv_func_snprintf = no || test $REPLACE_SNPRINTF = 1]
+printf-frexp    [test $ac_cv_func_snprintf = no || test $REPLACE_SNPRINTF = 1]
+printf-frexpl   [test $ac_cv_func_snprintf = no || test $REPLACE_SNPRINTF = 1]
+signbit         [test $ac_cv_func_snprintf = no || test $REPLACE_SNPRINTF = 1]
+fpucw           [test $ac_cv_func_snprintf = no || test $REPLACE_SNPRINTF = 1]
 
 configure.ac:
 gl_FUNC_SNPRINTF_POSIX
--- modules/socket.orig Mon May  2 01:51:11 2011
+++ modules/socket      Sun May  1 22:07:44 2011
@@ -7,8 +7,8 @@
 
 Depends-on:
 sys_socket
-errno
-sockets
+errno           [test "$ac_cv_header_winsock2_h" = yes]
+sockets         [test "$ac_cv_header_winsock2_h" = yes]
 
 configure.ac:
 AC_REQUIRE([gl_HEADER_SYS_SOCKET])
--- modules/sprintf-posix.orig  Mon May  2 01:51:11 2011
+++ modules/sprintf-posix       Sun May  1 21:56:59 2011
@@ -14,20 +14,20 @@
 
 Depends-on:
 stdio
-vasnprintf
-isnand-nolibm
-isnanl-nolibm
-frexp-nolibm
-frexpl-nolibm
-printf-frexp
-printf-frexpl
-signbit
-fpucw
 nocrash
 printf-safe
-stdint
-errno
 multiarch
+vasnprintf      [test $REPLACE_SPRINTF = 1]
+isnand-nolibm   [test $REPLACE_SPRINTF = 1]
+isnanl-nolibm   [test $REPLACE_SPRINTF = 1]
+frexp-nolibm    [test $REPLACE_SPRINTF = 1]
+frexpl-nolibm   [test $REPLACE_SPRINTF = 1]
+printf-frexp    [test $REPLACE_SPRINTF = 1]
+printf-frexpl   [test $REPLACE_SPRINTF = 1]
+signbit         [test $REPLACE_SPRINTF = 1]
+fpucw           [test $REPLACE_SPRINTF = 1]
+stdint          [test $REPLACE_SPRINTF = 1]
+errno           [test $REPLACE_SPRINTF = 1]
 
 configure.ac:
 gl_FUNC_SPRINTF_POSIX
--- modules/sqrtl.orig  Mon May  2 01:51:11 2011
+++ modules/sqrtl       Sun May  1 22:12:35 2011
@@ -8,11 +8,11 @@
 Depends-on:
 math
 extensions
-float
-isnanl
-frexpl
-ldexpl
-sqrt
+float           [test $HAVE_SQRTL = 0]
+isnanl          [test $HAVE_SQRTL = 0]
+frexpl          [test $HAVE_SQRTL = 0]
+ldexpl          [test $HAVE_SQRTL = 0]
+sqrt            [test $HAVE_SQRTL = 0]
 
 configure.ac:
 gl_FUNC_SQRTL
--- modules/stat.orig   Mon May  2 01:51:11 2011
+++ modules/stat        Sun May  1 22:17:58 2011
@@ -6,9 +6,9 @@
 m4/stat.m4
 
 Depends-on:
-dosname
-stdbool
 sys_stat
+dosname         [test $REPLACE_STAT = 1]
+stdbool         [test $REPLACE_STAT = 1]
 
 configure.ac:
 gl_FUNC_STAT
--- modules/strchrnul.orig      Mon May  2 01:51:11 2011
+++ modules/strchrnul   Sun May  1 23:37:38 2011
@@ -8,9 +8,9 @@
 m4/strchrnul.m4
 
 Depends-on:
-extensions
 string
-rawmemchr
+extensions
+rawmemchr       [test $HAVE_STRCHRNUL = 0 || test $REPLACE_STRCHRNUL = 1]
 
 configure.ac:
 gl_FUNC_STRCHRNUL
--- modules/strdup-posix.orig   Mon May  2 01:51:11 2011
+++ modules/strdup-posix        Sun May  1 22:18:59 2011
@@ -7,7 +7,7 @@
 
 Depends-on:
 string
-malloc-posix
+malloc-posix    [test $ac_cv_func_strdup = no || test $REPLACE_STRDUP = 1]
 
 configure.ac:
 gl_FUNC_STRDUP_POSIX
--- modules/strerror.orig       Mon May  2 01:51:11 2011
+++ modules/strerror    Sun May  1 22:19:55 2011
@@ -6,9 +6,9 @@
 m4/strerror.m4
 
 Depends-on:
-errno
-intprops
 string
+errno           [test $REPLACE_STRERROR = 1]
+intprops        [test $REPLACE_STRERROR = 1]
 
 configure.ac:
 gl_FUNC_STRERROR
--- modules/strerror_r-posix.orig       Mon May  2 01:51:11 2011
+++ modules/strerror_r-posix    Sun May  1 22:20:31 2011
@@ -7,10 +7,10 @@
 
 Depends-on:
 string
-errno
 extensions
-lock
-strerror
+errno           [test $HAVE_DECL_STRERROR_R = 0 || test $REPLACE_STRERROR_R = 
1]
+lock            [test $HAVE_DECL_STRERROR_R = 0 || test $REPLACE_STRERROR_R = 
1]
+strerror        [test $HAVE_DECL_STRERROR_R = 0 || test $REPLACE_STRERROR_R = 
1]
 
 configure.ac:
 gl_FUNC_STRERROR_R
--- modules/strndup.orig        Mon May  2 01:51:11 2011
+++ modules/strndup     Sun May  1 22:21:44 2011
@@ -6,9 +6,9 @@
 m4/strndup.m4
 
 Depends-on:
-extensions
 string
-strnlen
+extensions
+strnlen         [test $ac_cv_func_strndup = no || test $REPLACE_STRNDUP = 1]
 
 configure.ac:
 gl_FUNC_STRNDUP
--- modules/strnlen.orig        Mon May  2 01:51:11 2011
+++ modules/strnlen     Sun May  1 22:22:33 2011
@@ -6,9 +6,9 @@
 m4/strnlen.m4
 
 Depends-on:
-extensions
 string
-memchr-obsolete
+extensions
+memchr-obsolete [test $HAVE_DECL_STRNLEN = 0 || test $REPLACE_STRNLEN = 1]
 
 configure.ac:
 gl_FUNC_STRNLEN
--- modules/strptime.orig       Mon May  2 01:51:11 2011
+++ modules/strptime    Sun May  1 22:23:16 2011
@@ -7,13 +7,13 @@
 m4/tm_gmtoff.m4
 
 Depends-on:
-extensions
-sys_time
-string
-strcase
-stdbool
 time
-time_r
+extensions
+sys_time        [test $HAVE_STRPTIME = 0]
+string          [test $HAVE_STRPTIME = 0]
+strcase         [test $HAVE_STRPTIME = 0]
+stdbool         [test $HAVE_STRPTIME = 0]
+time_r          [test $HAVE_STRPTIME = 0]
 
 configure.ac:
 gl_FUNC_STRPTIME
--- modules/strsep.orig Mon May  2 01:51:11 2011
+++ modules/strsep      Sun May  1 23:48:12 2011
@@ -6,9 +6,9 @@
 m4/strsep.m4
 
 Depends-on:
-extensions
 string
-strpbrk
+extensions
+strpbrk         [test $HAVE_STRSEP = 0]
 
 configure.ac:
 gl_FUNC_STRSEP
--- modules/strsignal.orig      Mon May  2 01:51:11 2011
+++ modules/strsignal   Sun May  1 22:24:05 2011
@@ -8,12 +8,12 @@
 
 Depends-on:
 string
-gettext-h
-lock
-tls
-snprintf
-memset
 extensions
+gettext-h       [test $ac_cv_func_strsignal = no || test $REPLACE_STRSIGNAL = 
1]
+lock            [test $ac_cv_func_strsignal = no || test $REPLACE_STRSIGNAL = 
1]
+tls             [test $ac_cv_func_strsignal = no || test $REPLACE_STRSIGNAL = 
1]
+snprintf        [test $ac_cv_func_strsignal = no || test $REPLACE_STRSIGNAL = 
1]
+memset          [test $ac_cv_func_strsignal = no || test $REPLACE_STRSIGNAL = 
1]
 
 configure.ac:
 gl_FUNC_STRSIGNAL
--- modules/strstr-simple.orig  Mon May  2 01:51:11 2011
+++ modules/strstr-simple       Sun May  1 22:24:39 2011
@@ -8,9 +8,9 @@
 
 Depends-on:
 string
-stdbool
-memchr
-memcmp
+stdbool         [test $REPLACE_STRSTR = 1]
+memchr          [test $REPLACE_STRSTR = 1]
+memcmp          [test $REPLACE_STRSTR = 1]
 
 configure.ac:
 gl_FUNC_STRSTR_SIMPLE
--- modules/strtod.orig Mon May  2 01:51:11 2011
+++ modules/strtod      Sun May  1 22:25:55 2011
@@ -7,10 +7,10 @@
 m4/ldexp.m4
 
 Depends-on:
-c-ctype
-stdbool
 stdlib
 strtod-obsolete
+c-ctype         [test $HAVE_STRTOD = 0 || test $REPLACE_STRTOD = 1]
+stdbool         [test $HAVE_STRTOD = 0 || test $REPLACE_STRTOD = 1]
 
 configure.ac:
 gl_FUNC_STRTOD
--- modules/strtoimax.orig      Mon May  2 01:51:11 2011
+++ modules/strtoimax   Sun May  1 22:29:12 2011
@@ -7,10 +7,10 @@
 m4/strtoimax.m4
 
 Depends-on:
-strtoll
-verify
 inttypes-incomplete
-stdint
+verify          [test "$ac_cv_have_decl_strtoimax" != yes && test 
$ac_cv_func_strtoimax = no]
+stdint          [test "$ac_cv_have_decl_strtoimax" != yes && test 
$ac_cv_func_strtoimax = no]
+strtoll         [test "$ac_cv_have_decl_strtoimax" != yes && test 
$ac_cv_func_strtoimax = no && test $ac_cv_type_long_long_int = yes]
 
 configure.ac:
 gl_FUNC_STRTOIMAX
--- modules/strtok_r.orig       Mon May  2 01:51:11 2011
+++ modules/strtok_r    Sun May  1 22:30:07 2011
@@ -7,7 +7,7 @@
 
 Depends-on:
 string
-strpbrk
+strpbrk         [test $ac_cv_func_strtok_r = no]
 
 configure.ac:
 gl_FUNC_STRTOK_R
--- modules/strtoumax.orig      Mon May  2 01:51:11 2011
+++ modules/strtoumax   Sun May  1 22:29:10 2011
@@ -8,10 +8,10 @@
 m4/strtoumax.m4
 
 Depends-on:
-strtoull
-verify
 inttypes-incomplete
-stdint
+verify          [test "$ac_cv_have_decl_strtoumax" != yes && test 
$ac_cv_func_strtoumax = no]
+stdint          [test "$ac_cv_have_decl_strtoumax" != yes && test 
$ac_cv_func_strtoumax = no]
+strtoull        [test "$ac_cv_have_decl_strtoumax" != yes && test 
$ac_cv_func_strtoumax = no && test $ac_cv_type_unsigned_long_long_int = yes]
 
 configure.ac:
 gl_FUNC_STRTOUMAX
--- modules/symlink.orig        Mon May  2 01:51:11 2011
+++ modules/symlink     Sun May  1 22:30:45 2011
@@ -6,8 +6,8 @@
 m4/symlink.m4
 
 Depends-on:
-lstat
 unistd
+lstat           [test $HAVE_SYMLINK = 0 || test $REPLACE_SYMLINK = 1]
 
 configure.ac:
 gl_FUNC_SYMLINK
--- modules/symlinkat.orig      Mon May  2 01:51:11 2011
+++ modules/symlinkat   Sun May  1 22:31:24 2011
@@ -6,11 +6,11 @@
 m4/symlinkat.m4
 
 Depends-on:
+unistd
 extensions
 fcntl-h
-openat
-symlink
-unistd
+openat          [test $HAVE_SYMLINKAT = 0]
+symlink         [test $HAVE_SYMLINKAT = 0]
 
 configure.ac:
 gl_FUNC_SYMLINKAT
--- modules/tanl.orig   Mon May  2 01:51:11 2011
+++ modules/tanl        Sun May  1 22:33:27 2011
@@ -10,10 +10,10 @@
 Depends-on:
 math
 extensions
-float
-isnanl
-floor
-floorl
+float           [test $HAVE_TANL = 0]
+isnanl          [test $HAVE_TANL = 0]
+floor           [test $HAVE_TANL = 0]
+floorl          [test $HAVE_TANL = 0]
 
 configure.ac:
 gl_FUNC_TANL
--- modules/tcgetsid.orig       Mon May  2 01:51:11 2011
+++ modules/tcgetsid    Sun May  1 22:33:55 2011
@@ -9,7 +9,7 @@
 Depends-on:
 termios
 extensions
-sys_ioctl
+sys_ioctl       [test $ac_cv_func_tcgetsid = no]
 
 configure.ac:
 gl_FUNC_TCGETSID
--- modules/tmpfile.orig        Mon May  2 01:51:11 2011
+++ modules/tmpfile     Sun May  1 22:34:26 2011
@@ -7,9 +7,9 @@
 
 Depends-on:
 stdio
-pathmax
-tempname
-tmpdir
+pathmax         [test $REPLACE_TMPFILE = 1]
+tempname        [test $REPLACE_TMPFILE = 1]
+tmpdir          [test $REPLACE_TMPFILE = 1]
 
 configure.ac:
 gl_FUNC_TMPFILE
--- modules/trunc.orig  Mon May  2 01:51:11 2011
+++ modules/trunc       Sun May  1 23:39:59 2011
@@ -8,7 +8,7 @@
 Depends-on:
 math
 extensions
-float
+float           [test $HAVE_DECL_TRUNC = 0 || test $REPLACE_TRUNC = 1]
 
 configure.ac:
 gl_FUNC_TRUNC
--- modules/truncf.orig Mon May  2 01:51:11 2011
+++ modules/truncf      Sun May  1 23:40:16 2011
@@ -9,7 +9,7 @@
 Depends-on:
 math
 extensions
-float
+float           [test $HAVE_DECL_TRUNCF = 0 || test $REPLACE_TRUNCF = 1]
 
 configure.ac:
 gl_FUNC_TRUNCF
--- modules/truncl.orig Mon May  2 01:51:11 2011
+++ modules/truncl      Sun May  1 23:40:35 2011
@@ -9,7 +9,7 @@
 Depends-on:
 math
 extensions
-float
+float           [test $HAVE_DECL_TRUNCL = 0 || test $REPLACE_TRUNCL = 1]
 
 configure.ac:
 gl_FUNC_TRUNCL
--- modules/uname.orig  Mon May  2 01:51:11 2011
+++ modules/uname       Sun May  1 22:35:05 2011
@@ -7,7 +7,7 @@
 
 Depends-on:
 sys_utsname
-gethostname
+gethostname     [test $HAVE_UNAME = 0]
 
 configure.ac:
 gl_FUNC_UNAME
--- modules/unlink.orig Mon May  2 01:51:11 2011
+++ modules/unlink      Sun May  1 22:35:45 2011
@@ -6,9 +6,9 @@
 m4/unlink.m4
 
 Depends-on:
-dosname
-lstat
 unistd
+dosname         [test $REPLACE_UNLINK = 1]
+lstat           [test $REPLACE_UNLINK = 1]
 
 configure.ac:
 gl_FUNC_UNLINK
--- modules/unlockpt.orig       Mon May  2 01:51:11 2011
+++ modules/unlockpt    Sun May  1 22:36:05 2011
@@ -9,7 +9,7 @@
 Depends-on:
 stdlib
 extensions
-ptsname
+ptsname         [test $HAVE_UNLOCKPT = 0]
 
 configure.ac:
 gl_FUNC_UNLOCKPT
--- modules/unsetenv.orig       Mon May  2 01:51:11 2011
+++ modules/unsetenv    Sun May  1 21:31:31 2011
@@ -7,8 +7,8 @@
 
 Depends-on:
 stdlib
-unistd
-environ
+unistd          [test $ac_cv_func_unsetenv = no || test $REPLACE_UNSETENV = 1]
+environ         [test $ac_cv_func_unsetenv = no || test $REPLACE_UNSETENV = 1]
 
 configure.ac:
 gl_FUNC_UNSETENV
--- modules/usleep.orig Mon May  2 01:51:11 2011
+++ modules/usleep      Sun May  1 23:41:41 2011
@@ -6,9 +6,9 @@
 m4/usleep.m4
 
 Depends-on:
-extensions
-sleep
 unistd
+extensions
+sleep           [test $HAVE_USLEEP = 0 || test $REPLACE_USLEEP = 1]
 
 configure.ac:
 gl_FUNC_USLEEP
--- modules/utimensat.orig      Mon May  2 01:51:11 2011
+++ modules/utimensat   Sun May  1 22:37:34 2011
@@ -6,10 +6,10 @@
 m4/utimensat.m4
 
 Depends-on:
-openat
 sys_stat
-utimens
 extensions
+openat          [test $HAVE_UTIMENSAT = 0 || test $REPLACE_UTIMENSAT = 1]
+utimens         [test $HAVE_UTIMENSAT = 0 || test $REPLACE_UTIMENSAT = 1]
 
 configure.ac:
 gl_FUNC_UTIMENSAT
--- modules/vasprintf.orig      Mon May  2 01:51:11 2011
+++ modules/vasprintf   Sun May  1 23:45:36 2011
@@ -12,10 +12,10 @@
 m4/vasprintf.m4
 
 Depends-on:
-extensions
-vasnprintf
 stdio
-errno
+extensions
+vasnprintf      [test $HAVE_VASPRINTF = 0 || test $REPLACE_VASPRINTF = 1]
+errno           [test $HAVE_VASPRINTF = 0 || test $REPLACE_VASPRINTF = 1]
 
 configure.ac:
 gl_FUNC_VASPRINTF
--- modules/vdprintf.orig       Mon May  2 01:51:11 2011
+++ modules/vdprintf    Sun May  1 22:00:39 2011
@@ -7,9 +7,9 @@
 
 Depends-on:
 stdio
-vasnprintf
-full-write
-errno
+vasnprintf      [test $ac_cv_func_vdprintf = no || test $REPLACE_VDPRINTF = 1]
+full-write      [test $ac_cv_func_vdprintf = no || test $REPLACE_VDPRINTF = 1]
+errno           [test $ac_cv_func_vdprintf = no || test $REPLACE_VDPRINTF = 1]
 
 configure.ac:
 gl_FUNC_VDPRINTF
--- modules/vdprintf-posix.orig Mon May  2 01:51:11 2011
+++ modules/vdprintf-posix      Sun May  1 22:01:04 2011
@@ -14,18 +14,18 @@
 
 Depends-on:
 vdprintf
-vasnprintf
-isnand-nolibm
-isnanl-nolibm
-frexp-nolibm
-frexpl-nolibm
-printf-frexp
-printf-frexpl
-signbit
-fpucw
 nocrash
 printf-safe
 multiarch
+vasnprintf      [test $ac_cv_func_vdprintf = no || test $REPLACE_VDPRINTF = 1]
+isnand-nolibm   [test $ac_cv_func_vdprintf = no || test $REPLACE_VDPRINTF = 1]
+isnanl-nolibm   [test $ac_cv_func_vdprintf = no || test $REPLACE_VDPRINTF = 1]
+frexp-nolibm    [test $ac_cv_func_vdprintf = no || test $REPLACE_VDPRINTF = 1]
+frexpl-nolibm   [test $ac_cv_func_vdprintf = no || test $REPLACE_VDPRINTF = 1]
+printf-frexp    [test $ac_cv_func_vdprintf = no || test $REPLACE_VDPRINTF = 1]
+printf-frexpl   [test $ac_cv_func_vdprintf = no || test $REPLACE_VDPRINTF = 1]
+signbit         [test $ac_cv_func_vdprintf = no || test $REPLACE_VDPRINTF = 1]
+fpucw           [test $ac_cv_func_vdprintf = no || test $REPLACE_VDPRINTF = 1]
 
 configure.ac:
 gl_FUNC_VDPRINTF_POSIX
--- modules/vfprintf-posix.orig Mon May  2 01:51:11 2011
+++ modules/vfprintf-posix      Sun May  1 22:01:55 2011
@@ -14,20 +14,20 @@
 
 Depends-on:
 stdio
-fseterr
-vasnprintf
-isnand-nolibm
-isnanl-nolibm
-frexp-nolibm
-frexpl-nolibm
-printf-frexp
-printf-frexpl
-signbit
-fpucw
 nocrash
 printf-safe
-errno
 multiarch
+fseterr         [test $REPLACE_VFPRINTF = 1]
+vasnprintf      [test $REPLACE_VFPRINTF = 1]
+isnand-nolibm   [test $REPLACE_VFPRINTF = 1]
+isnanl-nolibm   [test $REPLACE_VFPRINTF = 1]
+frexp-nolibm    [test $REPLACE_VFPRINTF = 1]
+frexpl-nolibm   [test $REPLACE_VFPRINTF = 1]
+printf-frexp    [test $REPLACE_VFPRINTF = 1]
+printf-frexpl   [test $REPLACE_VFPRINTF = 1]
+signbit         [test $REPLACE_VFPRINTF = 1]
+fpucw           [test $REPLACE_VFPRINTF = 1]
+errno           [test $REPLACE_VFPRINTF = 1]
 
 configure.ac:
 gl_FUNC_VFPRINTF_POSIX
--- modules/vprintf-posix.orig  Mon May  2 01:51:11 2011
+++ modules/vprintf-posix       Sun May  1 22:03:02 2011
@@ -14,8 +14,8 @@
 
 Depends-on:
 stdio
-vfprintf-posix
 printf-safe
+vfprintf-posix  [test $REPLACE_VPRINTF = 1]
 
 configure.ac:
 gl_FUNC_VPRINTF_POSIX
--- modules/vsnprintf.orig      Mon May  2 01:51:11 2011
+++ modules/vsnprintf   Sun May  1 22:03:41 2011
@@ -9,8 +9,8 @@
 
 Depends-on:
 stdio
-vasnprintf
-errno
+vasnprintf      [test $ac_cv_func_vsnprintf = no || test $REPLACE_VSNPRINTF = 
1]
+errno           [test $ac_cv_func_vsnprintf = no || test $REPLACE_VSNPRINTF = 
1]
 
 configure.ac:
 gl_FUNC_VSNPRINTF
--- modules/vsnprintf-posix.orig        Mon May  2 01:51:11 2011
+++ modules/vsnprintf-posix     Sun May  1 22:04:20 2011
@@ -14,18 +14,18 @@
 
 Depends-on:
 vsnprintf
-vasnprintf
-isnand-nolibm
-isnanl-nolibm
-frexp-nolibm
-frexpl-nolibm
-printf-frexp
-printf-frexpl
-signbit
-fpucw
 nocrash
 printf-safe
 multiarch
+vasnprintf      [test $ac_cv_func_vsnprintf = no || test $REPLACE_VSNPRINTF = 
1]
+isnand-nolibm   [test $ac_cv_func_vsnprintf = no || test $REPLACE_VSNPRINTF = 
1]
+isnanl-nolibm   [test $ac_cv_func_vsnprintf = no || test $REPLACE_VSNPRINTF = 
1]
+frexp-nolibm    [test $ac_cv_func_vsnprintf = no || test $REPLACE_VSNPRINTF = 
1]
+frexpl-nolibm   [test $ac_cv_func_vsnprintf = no || test $REPLACE_VSNPRINTF = 
1]
+printf-frexp    [test $ac_cv_func_vsnprintf = no || test $REPLACE_VSNPRINTF = 
1]
+printf-frexpl   [test $ac_cv_func_vsnprintf = no || test $REPLACE_VSNPRINTF = 
1]
+signbit         [test $ac_cv_func_vsnprintf = no || test $REPLACE_VSNPRINTF = 
1]
+fpucw           [test $ac_cv_func_vsnprintf = no || test $REPLACE_VSNPRINTF = 
1]
 
 configure.ac:
 gl_FUNC_VSNPRINTF_POSIX
--- modules/vsprintf-posix.orig Mon May  2 01:51:11 2011
+++ modules/vsprintf-posix      Sun May  1 22:05:06 2011
@@ -14,20 +14,20 @@
 
 Depends-on:
 stdio
-vasnprintf
-isnand-nolibm
-isnanl-nolibm
-frexp-nolibm
-frexpl-nolibm
-printf-frexp
-printf-frexpl
-signbit
-fpucw
 nocrash
 printf-safe
-stdint
-errno
 multiarch
+vasnprintf      [test $REPLACE_VSPRINTF = 1]
+isnand-nolibm   [test $REPLACE_VSPRINTF = 1]
+isnanl-nolibm   [test $REPLACE_VSPRINTF = 1]
+frexp-nolibm    [test $REPLACE_VSPRINTF = 1]
+frexpl-nolibm   [test $REPLACE_VSPRINTF = 1]
+printf-frexp    [test $REPLACE_VSPRINTF = 1]
+printf-frexpl   [test $REPLACE_VSPRINTF = 1]
+signbit         [test $REPLACE_VSPRINTF = 1]
+fpucw           [test $REPLACE_VSPRINTF = 1]
+stdint          [test $REPLACE_VSPRINTF = 1]
+errno           [test $REPLACE_VSPRINTF = 1]
 
 configure.ac:
 gl_FUNC_VSPRINTF_POSIX
--- modules/wcrtomb.orig        Mon May  2 01:51:11 2011
+++ modules/wcrtomb     Sun May  1 22:38:07 2011
@@ -12,9 +12,9 @@
 m4/codeset.m4
 
 Depends-on:
-extensions
 wchar
-mbsinit
+extensions
+mbsinit         [test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1]
 
 configure.ac:
 gl_FUNC_WCRTOMB
--- modules/wcscasecmp.orig     Mon May  2 01:51:11 2011
+++ modules/wcscasecmp  Sun May  1 23:43:31 2011
@@ -8,7 +8,7 @@
 
 Depends-on:
 wchar
-wctype-h
+wctype-h        [test $HAVE_WCSCASECMP = 0]
 
 configure.ac:
 gl_FUNC_WCSCASECMP
--- modules/wcscspn.orig        Mon May  2 01:51:11 2011
+++ modules/wcscspn     Sun May  1 22:38:31 2011
@@ -14,8 +14,8 @@
 
 Depends-on:
 wchar
-wcslen
-wcschr
+wcslen          [test $HAVE_WCSCSPN = 0]
+wcschr          [test $HAVE_WCSCSPN = 0]
 
 configure.ac:
 gl_FUNC_WCSCSPN
--- modules/wcsdup.orig Mon May  2 01:51:12 2011
+++ modules/wcsdup      Sun May  1 22:38:54 2011
@@ -8,8 +8,8 @@
 
 Depends-on:
 wchar
-wcslen
-wmemcpy
+wcslen          [test $HAVE_WCSDUP = 0]
+wmemcpy         [test $HAVE_WCSDUP = 0]
 
 configure.ac:
 gl_FUNC_WCSDUP
--- modules/wcsncasecmp.orig    Mon May  2 01:51:12 2011
+++ modules/wcsncasecmp Sun May  1 23:43:50 2011
@@ -8,7 +8,7 @@
 
 Depends-on:
 wchar
-wctype-h
+wctype-h        [test $HAVE_WCSNCASECMP = 0]
 
 configure.ac:
 gl_FUNC_WCSNCASECMP
--- modules/wcsnrtombs.orig     Mon May  2 01:51:12 2011
+++ modules/wcsnrtombs  Sun May  1 22:39:21 2011
@@ -13,9 +13,9 @@
 m4/codeset.m4
 
 Depends-on:
-extensions
 wchar
-wcrtomb
+extensions
+wcrtomb         [test $HAVE_WCSNRTOMBS = 0 || test $REPLACE_WCSNRTOMBS = 1]
 
 configure.ac:
 gl_FUNC_WCSNRTOMBS
--- modules/wcspbrk.orig        Mon May  2 01:51:12 2011
+++ modules/wcspbrk     Sun May  1 22:39:42 2011
@@ -14,7 +14,7 @@
 
 Depends-on:
 wchar
-wcschr
+wcschr          [test $HAVE_WCSPBRK = 0]
 
 configure.ac:
 gl_FUNC_WCSPBRK
--- modules/wcsrtombs.orig      Mon May  2 01:51:12 2011
+++ modules/wcsrtombs   Sun May  1 22:40:08 2011
@@ -14,9 +14,9 @@
 m4/codeset.m4
 
 Depends-on:
-extensions
 wchar
-wcrtomb
+extensions
+wcrtomb         [test $HAVE_WCSRTOMBS = 0 || test $REPLACE_WCSRTOMBS = 1]
 
 configure.ac:
 gl_FUNC_WCSRTOMBS
--- modules/wcsspn.orig Mon May  2 01:51:12 2011
+++ modules/wcsspn      Sun May  1 22:40:30 2011
@@ -14,7 +14,7 @@
 
 Depends-on:
 wchar
-wcschr
+wcschr          [test $HAVE_WCSSPN = 0]
 
 configure.ac:
 gl_FUNC_WCSSPN
--- modules/wcsstr.orig Mon May  2 01:51:12 2011
+++ modules/wcsstr      Sun May  1 22:41:17 2011
@@ -8,7 +8,7 @@
 
 Depends-on:
 wchar
-wcschr
+wcschr          [test $HAVE_WCSSTR = 0]
 
 configure.ac:
 gl_FUNC_WCSSTR
--- modules/wcstok.orig Mon May  2 01:51:12 2011
+++ modules/wcstok      Sun May  1 22:41:41 2011
@@ -8,8 +8,8 @@
 
 Depends-on:
 wchar
-wcsspn
-wcspbrk
+wcsspn          [test $HAVE_WCSTOK = 0]
+wcspbrk         [test $HAVE_WCSTOK = 0]
 
 configure.ac:
 gl_FUNC_WCSTOK
--- modules/wcswidth.orig       Mon May  2 01:51:12 2011
+++ modules/wcswidth    Sun May  1 22:42:03 2011
@@ -9,7 +9,7 @@
 
 Depends-on:
 wchar
-wcwidth
+wcwidth         [test $HAVE_WCSWIDTH = 0 || test $REPLACE_WCSWIDTH = 1]
 
 configure.ac:
 gl_FUNC_WCSWIDTH
--- modules/wctob.orig  Mon May  2 01:51:12 2011
+++ modules/wctob       Sun May  1 22:42:40 2011
@@ -9,7 +9,7 @@
 
 Depends-on:
 wchar
-wctomb
+wctomb          [test $ac_cv_func_wctob = no || test $REPLACE_WCTOB = 1]
 
 configure.ac:
 gl_FUNC_WCTOB
--- modules/wctomb.orig Mon May  2 01:51:12 2011
+++ modules/wctomb      Sun May  1 22:43:10 2011
@@ -8,8 +8,8 @@
 
 Depends-on:
 stdlib
-wcrtomb
-wchar
+wcrtomb         [test $REPLACE_WCTOMB = 1]
+wchar           [test $REPLACE_WCTOMB = 1]
 
 configure.ac:
 gl_FUNC_WCTOMB
--- modules/wctype.orig Mon May  2 01:51:12 2011
+++ modules/wctype      Sun May  1 22:44:01 2011
@@ -14,7 +14,7 @@
 
 Depends-on:
 wctype-h
-iswblank
+iswblank        [test $HAVE_WCTYPE_T = 0]
 
 configure.ac:
 gl_FUNC_WCTYPE
--- modules/wcwidth.orig        Mon May  2 01:51:12 2011
+++ modules/wcwidth     Sun May  1 22:44:52 2011
@@ -8,12 +8,12 @@
 m4/wint_t.m4
 
 Depends-on:
-extensions
 wchar
-wctype-h
-localcharset
-streq
-uniwidth/width
+extensions
+wctype-h        [test $ac_cv_func_wcwidth != yes || test $REPLACE_WCWIDTH = 1]
+localcharset    [test $ac_cv_func_wcwidth != yes || test $REPLACE_WCWIDTH = 1]
+streq           [test $ac_cv_func_wcwidth != yes || test $REPLACE_WCWIDTH = 1]
+uniwidth/width  [test $ac_cv_func_wcwidth != yes || test $REPLACE_WCWIDTH = 1]
 
 configure.ac:
 gl_FUNC_WCWIDTH
--- modules/write.orig  Mon May  2 01:51:12 2011
+++ modules/write       Sun May  1 22:40:53 2011
@@ -7,7 +7,7 @@
 
 Depends-on:
 unistd
-raise
+raise           [test $REPLACE_WRITE = 1]
 
 configure.ac:
 gl_FUNC_WRITE
-- 
In memoriam Itzhak Katzenelson <http://en.wikipedia.org/wiki/Itzhak_Katzenelson>



reply via email to

[Prev in Thread] Current Thread [Next in Thread]