X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fxstrtoumax.m4;h=9ab71ec6dd4b26268bc8bab9faf2b2860f0ad172;hb=ceb39112725850e44f7e0626e253d72cb9dcc94a;hp=1befbdd8dfa01f65e6cd84fab31e89367d3573d3;hpb=0381e0bc143e66ed5facb89646879cbbdd833f84;p=gnulib.git

diff --git a/m4/xstrtoumax.m4 b/m4/xstrtoumax.m4
index 1befbdd8d..9ab71ec6d 100644
--- a/m4/xstrtoumax.m4
+++ b/m4/xstrtoumax.m4
@@ -1,13 +1,15 @@
-#serial 3
+#serial 4
 
 # autoconf tests required for use of xstrtoumax.c
 
-AC_DEFUN(jm_AC_PREREQ_XSTRTOUMAX,
+AC_DEFUN([jm_AC_PREREQ_XSTRTOUMAX],
 [
+  AC_REQUIRE([jm_AC_TYPE_INTMAX_T])
   AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])
-  AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
+  AC_REQUIRE([jm_AC_TYPE_LONG_LONG])
   AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
-  AC_CHECK_HEADERS(stdlib.h)
+  AC_CHECK_DECLS([strtol, strtoul, strtoull, strtoimax, strtoumax])
+  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,
@@ -22,20 +24,17 @@ AC_DEFUN(jm_AC_PREREQ_XSTRTOUMAX,
     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)
-      ;;
-  esac
-
+  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
-
 ])