X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fxstrtoumax.m4;h=523ebe0e3e53dd52102d22be5801dec4d05fc938;hb=69bf446b34292cd2d2a73f1838325fbeb0ff7c25;hp=ee87c9a9a0e6b41067432f01e5953752c98c9b0a;hpb=23a921a83b9e9e7d1232a56d8fe757913b283651;p=gnulib.git

diff --git a/m4/xstrtoumax.m4 b/m4/xstrtoumax.m4
index ee87c9a9a..523ebe0e3 100644
--- a/m4/xstrtoumax.m4
+++ b/m4/xstrtoumax.m4
@@ -1,10 +1,42 @@
-#serial 1
+#serial 3
 
 # autoconf tests required for use of xstrtoumax.c
 
 AC_DEFUN(jm_AC_PREREQ_XSTRTOUMAX,
 [
-  jm_AC_HEADER_INTTYPES_H
-  AC_CHECK_HEADERS(stdlib.h)
-  AC_CHECK_FUNCS(strtoull strtoumax strtouq)
+  AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])
+  AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
+  AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
+  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,$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
+
 ])