X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fxstrtoumax.m4;h=523ebe0e3e53dd52102d22be5801dec4d05fc938;hb=55b0159d96e14497b31118b9db52f3e4546b26b0;hp=842d7292a2b6c189055c60e150d4ea93088e4aaf;hpb=3932f7dad2c464a97d8c36955c68b969ee84be61;p=gnulib.git

diff --git a/m4/xstrtoumax.m4 b/m4/xstrtoumax.m4
index 842d7292a..523ebe0e3 100644
--- a/m4/xstrtoumax.m4
+++ b/m4/xstrtoumax.m4
@@ -1,22 +1,41 @@
-#serial 1
+#serial 3
 
 # autoconf tests required for use of xstrtoumax.c
 
 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_FUNCS(strtoull strtoumax strtouq)
-  AC_REPLACE_FUNCS(strtoumax)
+  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,
+    AC_EGREP_CPP([inttypes_h_defines_strtoumax], [#include <inttypes.h>
+#ifdef strtoumax
+ inttypes_h_defines_strtoumax
+#endif],
+      jm_cv_func_strtoumax_macro=yes,
+      jm_cv_func_strtoumax_macro=no))
+
+  if test "$jm_cv_func_strtoumax_macro" != yes; then
+    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,$ac_cv_func_strtoumax" in
-    yes,no)
-      AC_REPLACE_FUNCS(strtoull)
+  case "$ac_cv_type_unsigned_long_long,$jm_cv_func_strtoumax_macro,$ac_cv_func_strtoumax" in
+    yes,no,no)
+      AC_REPLACE_FUNCS(strtoull strtol)
+      ;;
+  esac
+
+  case "$jm_cv_func_strtoumax_macro,$ac_cv_func_strtoumax" in
+    no,no)
+      AC_REPLACE_FUNCS(strtoul strtol)
       ;;
   esac