X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fxstrtoumax.m4;h=523ebe0e3e53dd52102d22be5801dec4d05fc938;hb=d91eb369fbc5f860b31fb23e825aff5b50034399;hp=1befbdd8dfa01f65e6cd84fab31e89367d3573d3;hpb=0381e0bc143e66ed5facb89646879cbbdd833f84;p=gnulib.git

diff --git a/m4/xstrtoumax.m4 b/m4/xstrtoumax.m4
index 1befbdd8d..523ebe0e3 100644
--- a/m4/xstrtoumax.m4
+++ b/m4/xstrtoumax.m4
@@ -7,7 +7,8 @@ AC_DEFUN(jm_AC_PREREQ_XSTRTOUMAX,
   AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])
   AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
   AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
-  AC_CHECK_HEADERS(stdlib.h)
+  AC_CHECK_DECLS([strtoul, strtoull])
+  AC_CHECK_HEADERS(limits.h stdlib.h)
 
   AC_CACHE_CHECK([whether <inttypes.h> defines strtoumax as a macro],
     jm_cv_func_strtoumax_macro,
@@ -28,13 +29,13 @@ AC_DEFUN(jm_AC_PREREQ_XSTRTOUMAX,
   dnl so we need the replacement strtoull only if strtoumax does not exist.
   case "$ac_cv_type_unsigned_long_long,$jm_cv_func_strtoumax_macro,$ac_cv_func_strtoumax" in
     yes,no,no)
-      AC_REPLACE_FUNCS(strtoull)
+      AC_REPLACE_FUNCS(strtoull strtol)
       ;;
   esac
 
   case "$jm_cv_func_strtoumax_macro,$ac_cv_func_strtoumax" in
     no,no)
-      AC_REPLACE_FUNCS(strtoul)
+      AC_REPLACE_FUNCS(strtoul strtol)
       ;;
   esac