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

diff --git a/m4/xstrtoumax.m4 b/m4/xstrtoumax.m4
index b9f27061c..a0fbcc36a 100644
--- a/m4/xstrtoumax.m4
+++ b/m4/xstrtoumax.m4
@@ -1,22 +1,9 @@
-#serial 1
+#serial 6
+dnl Cloned from xstrtoimax.m4.  Keep these files in sync.
 
-# autoconf tests required for use of xstrtoumax.c
-
-AC_DEFUN(jm_AC_PREREQ_XSTRTOUMAX,
+AC_DEFUN([gl_XSTRTOUMAX],
 [
-  AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
-  AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
-  AC_CHECK_HEADERS(stdlib.h)
-  AC_REPLACE_FUNCS(strtoumax)
-
-  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)
-      ;;
-  esac
-
+  dnl Prerequisites of lib/xstrtoumax.c.
+  AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])
+  AC_REQUIRE([gl_PREREQ_XSTRTOL])
 ])