Merge tag 'snapshot-start' into stable

[gnulib.git] / modules / strtoumax

diff --git a/modules/strtoumax b/modules/strtoumax
index dc72a0a..725f523 100644 (file)
--- 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