X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fxstrtoumax.m4;h=4f41061f1a878a65c0299d69f2879aaa99d22547;hb=6fa43d91583501728969c5fd2f7e9546208a5b4b;hp=d5a58f187d8923d9fc180918b852b3c0608b9b0a;hpb=ee76465ad82c04707c78ff3ed723358217c9e34f;p=gnulib.git

diff --git a/m4/xstrtoumax.m4 b/m4/xstrtoumax.m4
index d5a58f187..4f41061f1 100644
--- a/m4/xstrtoumax.m4
+++ b/m4/xstrtoumax.m4
@@ -1,42 +1,9 @@
-#serial 4
+#serial 5
+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([jm_XSTRTOUMAX],
 [
+  dnl Prerequisites of lib/xstrtoumax.c.
   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
-
+  AC_REQUIRE([gl_PREREQ_XSTRTOL])
 ])