* Makefile.in (GNULIB_TOOL_FLAG): Add --conditional-dependencies.

This new gnulib-tool option saves 'configure' the trouble of
checking for strtoull when strtoumax exists.

2 files changed, 12 insertions, 1 deletions

diff --git a/lib/gnulib.mk b/lib/gnulib.mk
index f686137d38d..faf89aaa0e6 100644
--- a/lib/gnulib.mk
+++ b/lib/gnulib.mk
@@ -96,7 +96,9 @@ EXTRA_libgnu_a_SOURCES += md5.c
 
 ## begin gnulib module dosname
 
+if gl_GNULIB_ENABLED_dosname
 
+endif
 EXTRA_DIST += dosname.h
 
 ## end   gnulib module dosname
@@ -157,8 +159,10 @@ EXTRA_libgnu_a_SOURCES += getopt.c getopt1.c
 
 ## begin gnulib module gettext-h
 
+if gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36
 libgnu_a_SOURCES += gettext.h
 
+endif
 ## end   gnulib module gettext-h
 
 ## begin gnulib module ignore-value
@@ -245,7 +249,9 @@ EXTRA_libgnu_a_SOURCES += readlink.c
 
 ## begin gnulib module stat
 
+if gl_GNULIB_ENABLED_stat
 
+endif
 EXTRA_DIST += stat.c
 
 EXTRA_libgnu_a_SOURCES += stat.c
@@ -576,7 +582,9 @@ EXTRA_libgnu_a_SOURCES += strftime.c
 
 ## begin gnulib module strtoull
 
+if gl_GNULIB_ENABLED_strtoull
 
+endif
 EXTRA_DIST += strtol.c strtoul.c strtoull.c
 
 EXTRA_libgnu_a_SOURCES += strtol.c strtoul.c strtoull.c
@@ -847,8 +855,10 @@ EXTRA_DIST += unistd.in.h
 
 ## begin gnulib module verify
 
+if gl_GNULIB_ENABLED_verify
 libgnu_a_SOURCES += verify.h
 
+endif
 ## end   gnulib module verify
 
 ## begin gnulib module warn-on-use
diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h
index b9ada2cd1a8..7513553b672 100644
--- a/lib/stdlib.in.h
+++ b/lib/stdlib.in.h
@@ -81,8 +81,9 @@ struct random_data
 # endif
 #endif
 
-#if (@GNULIB_MKSTEMP@ || @GNULIB_GETSUBOPT@ || defined GNULIB_POSIXCHECK) && ! defined __GLIBC__ && !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
+#if (@GNULIB_MKSTEMP@ || @GNULIB_MKSTEMPS@ || @GNULIB_GETSUBOPT@ || defined GNULIB_POSIXCHECK) && ! defined __GLIBC__ && !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
 /* On MacOS X 10.3, only <unistd.h> declares mkstemp.  */
+/* On MacOS X 10.5, only <unistd.h> declares mkstemps.  */
 /* On Cygwin 1.7.1, only <unistd.h> declares getsubopt.  */
 /* But avoid namespace pollution on glibc systems and native Windows.  */
 # include <unistd.h>