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

diff --git a/m4/xstrtoumax.m4 b/m4/xstrtoumax.m4
index 7ea69a92e..4f41061f1 100644
--- a/m4/xstrtoumax.m4
+++ b/m4/xstrtoumax.m4
@@ -1,40 +1,9 @@
-#serial 3
+#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],
 [
-  AC_REQUIRE([jm_AC_TYPE_INTMAX_T])
+  dnl Prerequisites of lib/xstrtoumax.c.
   AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])
-  AC_REQUIRE([jm_AC_TYPE_LONG_LONG])
-  AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
-  AC_CHECK_DECLS([strtoul, strtoull])
-  AC_CHECK_HEADERS(limits.h stdlib.h inttypes.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 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
+  AC_REQUIRE([gl_PREREQ_XSTRTOL])
 ])