X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fxstrtoumax.m4;h=7ea69a92edd2e01dde4f89fba325bedc85440377;hb=3a318239ecc55fac810a101b8d3923356c6e71c4;hp=a5a06eb52b3de22d9a4cd6ca815b2278bf83f825;hpb=38fbb60b6cd42d792ecb80f76fc4a06a22bf0933;p=gnulib.git

diff --git a/m4/xstrtoumax.m4 b/m4/xstrtoumax.m4
index a5a06eb52..7ea69a92e 100644
--- a/m4/xstrtoumax.m4
+++ b/m4/xstrtoumax.m4
@@ -2,12 +2,14 @@
 
 # autoconf tests required for use of xstrtoumax.c
 
-AC_DEFUN(jm_AC_PREREQ_XSTRTOUMAX,
+AC_DEFUN([jm_AC_PREREQ_XSTRTOUMAX],
 [
+  AC_REQUIRE([jm_AC_TYPE_INTMAX_T])
   AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])
-  AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
+  AC_REQUIRE([jm_AC_TYPE_LONG_LONG])
   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 inttypes.h)
 
   AC_CACHE_CHECK([whether <inttypes.h> defines strtoumax as a macro],
     jm_cv_func_strtoumax_macro,
@@ -22,15 +24,17 @@ AC_DEFUN(jm_AC_PREREQ_XSTRTOUMAX,
     AC_REPLACE_FUNCS(strtoumax)
   fi
 
-  dnl We don't need (and can't compile) the replacement strtoull
-  dnl unless the type `unsigned long long' exists.
-  dnl Also, only the replacement strtoumax invokes strtoull,
-  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)
+  dnl Only the replacement strtoumax invokes strtoul and strtoull,
+  dnl so we need the replacements only if strtoumax does not exist.
+  case "$jm_cv_func_strtoumax_macro,$ac_cv_func_strtoumax" in
+    no,no)
       AC_REPLACE_FUNCS(strtoul)
-      AC_REPLACE_FUNCS(strtoull)
+
+      dnl We don't need (and can't compile) the replacement strtoull
+      dnl unless the type `unsigned long long' exists.
+      if test "$ac_cv_type_unsigned_long_long" = yes; then
+	AC_REPLACE_FUNCS(strtoull)
+      fi
       ;;
   esac
-
 ])