X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fxstrtoumax.m4;h=9ab71ec6dd4b26268bc8bab9faf2b2860f0ad172;hb=11896d0dd1e87c291b215a20652505ec1c9dced5;hp=b9f27061cdca4d9f848913d89ec812adb19083ca;hpb=d0323184590209a42a5f201225cfd765ba91a5e5;p=gnulib.git

diff --git a/m4/xstrtoumax.m4 b/m4/xstrtoumax.m4
index b9f27061c..9ab71ec6d 100644
--- a/m4/xstrtoumax.m4
+++ b/m4/xstrtoumax.m4
@@ -1,22 +1,40 @@
-#serial 1
+#serial 4
 
 # autoconf tests required for use of xstrtoumax.c
 
-AC_DEFUN(jm_AC_PREREQ_XSTRTOUMAX,
+AC_DEFUN([jm_AC_PREREQ_XSTRTOUMAX],
 [
-  AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
+  AC_REQUIRE([jm_AC_TYPE_INTMAX_T])
+  AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])
+  AC_REQUIRE([jm_AC_TYPE_LONG_LONG])
   AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
-  AC_CHECK_HEADERS(stdlib.h)
-  AC_REPLACE_FUNCS(strtoumax)
+  AC_CHECK_DECLS([strtol, strtoul, strtoull, strtoimax, strtoumax])
+  AC_CHECK_HEADERS(limits.h stdlib.h inttypes.h)
 
-  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)
+  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 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)
+
+      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
-
 ])