X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fxstrtoumax.m4;h=afac77b3828d14887459d95c90e1f33f7911220c;hb=8de557e31178699dd6e839850056f0653cdfba89;hp=ae54e440df9940dabb7080fda53d8a6879fede12;hpb=bb14fb0e73cd4c855573c4a70782355f20551dbd;p=gnulib.git

diff --git a/m4/xstrtoumax.m4 b/m4/xstrtoumax.m4
index ae54e440d..afac77b38 100644
--- a/m4/xstrtoumax.m4
+++ b/m4/xstrtoumax.m4
@@ -1,50 +1,14 @@
-#serial 5
-dnl Closely related to xstrtoimax.m4.  Keep these files in sync.
+#serial 7
+dnl Cloned from xstrtoimax.m4.  Keep these files in sync.
 
-# autoconf tests required for use of xstrtoumax.c
+dnl Copyright (C) 1999, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
-AC_DEFUN([jm_AC_PREREQ_XSTRTOUMAX],
+AC_DEFUN([gl_XSTRTOUMAX],
 [
-  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)
-
-      dnl Check for strtol.  Mainly as a cue to cause automake to include
-      dnl strtol.c -- that file is included by each of strtoul.c and strtoull.c.
-      AC_REPLACE_FUNCS(strtol)
-      ;;
-  esac
-
-  case "$jm_cv_func_strtoumax_macro,$ac_cv_func_strtoumax" in
-    no,no)
-      AC_REPLACE_FUNCS(strtoul)
-
-      dnl See explanation above.
-      AC_REPLACE_FUNCS(strtol)
-      ;;
-  esac
-
+  dnl Prerequisites of lib/xstrtoumax.c.
+  AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])
+  AC_REQUIRE([gl_PREREQ_XSTRTOL])
 ])