X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fstrtoumax;h=725f523c25adc16c268b3b25a732b04ceb8dc7fd;hb=23eecb48e39afd0d267d64d40ba6bf97aa865e13;hp=dc72a0aac4f0cb903a32a37b8ab469579b795f8e;hpb=24bfc89ccc3fd4ce86652dbbb95afd844db59a07;p=gnulib.git

diff --git a/modules/strtoumax b/modules/strtoumax
index dc72a0aac..725f523c2 100644
--- a/modules/strtoumax
+++ b/modules/strtoumax
@@ -9,13 +9,13 @@ m4/strtoumax.m4
 
 Depends-on:
 inttypes-incomplete
-verify          [test $ac_cv_func_strtoumax = no]
-stdint          [test $ac_cv_func_strtoumax = no]
-strtoull        [test $ac_cv_func_strtoumax = no && test $ac_cv_type_unsigned_long_long_int = yes]
+verify          [test $HAVE_DECL_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1]
+stdint          [test $HAVE_DECL_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1]
+strtoull        [{ test $HAVE_DECL_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1; } && test $ac_cv_type_unsigned_long_long_int = yes]
 
 configure.ac:
 gl_FUNC_STRTOUMAX
-if test $ac_cv_func_strtoumax = no; then
+if test $HAVE_DECL_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1; then
   AC_LIBOBJ([strtoumax])
   gl_PREREQ_STRTOUMAX
 fi