X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fxstrtoimax.m4;h=ca1d2d57c7e07c8ad0fa60165674bee00bcf36ad;hb=ab0bec83a1b002d5508b180e38958de36e9ba560;hp=9664a603b1b04c3bd74c4e04013264ccebe7ba41;hpb=5a8e70acd3103c68d2c3f1a3e9db6b77b68b75f7;p=gnulib.git

diff --git a/m4/xstrtoimax.m4 b/m4/xstrtoimax.m4
index 9664a603b..ca1d2d57c 100644
--- a/m4/xstrtoimax.m4
+++ b/m4/xstrtoimax.m4
@@ -1,41 +1,14 @@
-#serial 1
+#serial 5
 dnl Cloned from xstrtoumax.m4.  Keep these files in sync.
 
-# autoconf tests required for use of xstrtoimax.c
+dnl Copyright (C) 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_XSTRTOIMAX],
+AC_DEFUN([gl_XSTRTOIMAX],
 [
-  AC_REQUIRE([jm_AC_TYPE_INTMAX_T])
-  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([strtol, strtoll, strtoimax])
-  AC_CHECK_HEADERS(limits.h stdlib.h inttypes.h)
-
-  AC_CACHE_CHECK([whether <inttypes.h> defines strtoimax as a macro],
-    jm_cv_func_strtoimax_macro,
-    AC_EGREP_CPP([inttypes_h_defines_strtoimax], [#include <inttypes.h>
-#ifdef strtoimax
- inttypes_h_defines_strtoimax
-#endif],
-      jm_cv_func_strtoimax_macro=yes,
-      jm_cv_func_strtoimax_macro=no))
-
-  if test "$jm_cv_func_strtoimax_macro" != yes; then
-    AC_REPLACE_FUNCS(strtoimax)
-  fi
-
-  dnl Only the replacement strtoimax invokes strtol and strtoll,
-  dnl so we need the replacements only if strtoimax does not exist.
-  case "$jm_cv_func_strtoimax_macro,$ac_cv_func_strtoimax" in
-    no,no)
-      AC_REPLACE_FUNCS(strtol)
-
-      dnl We don't need (and can't compile) the replacement strtoll
-      dnl unless the type `long long' exists.
-      if test "$ac_cv_type_long_long" = yes; then
-	AC_REPLACE_FUNCS(strtoll)
-      fi
-      ;;
-  esac
+  dnl Prerequisites of lib/xstrtoimax.c.
+  AC_REQUIRE([gl_AC_TYPE_INTMAX_T])
+  AC_REQUIRE([gl_PREREQ_XSTRTOL])
 ])