X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fuintmax_t.m4;h=222beffab9fbcf178a854d80e40dd3762348bcc9;hb=1e42e55b8d4e17667c2dc04b1c77fb5ec84ebfb9;hp=87bbbc1f51b5bf642ec1721cc31b498b1e013cdd;hpb=4e39e159321f14a906163dc73e812126931f9ece;p=gnulib.git

diff --git a/m4/uintmax_t.m4 b/m4/uintmax_t.m4
index 87bbbc1f5..222beffab 100644
--- a/m4/uintmax_t.m4
+++ b/m4/uintmax_t.m4
@@ -1,7 +1,9 @@
-#serial 1
+#serial 5
 
 dnl From Paul Eggert.
 
+AC_PREREQ(2.13)
+
 # Define uintmax_t to `unsigned long' or `unsigned long long'
 # if <inttypes.h> does not exist.
 
@@ -9,15 +11,12 @@ AC_DEFUN(jm_AC_TYPE_UINTMAX_T,
 [
   AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
   if test $jm_ac_cv_header_inttypes_h = no; then
-    AC_CACHE_CHECK(for unsigned long long, ac_cv_type_unsigned_long_long,
-    [AC_TRY_COMPILE([],
-      [unsigned long long i = (unsigned long long) -1;],
-      ac_cv_type_unsigned_long_long=yes,
-      ac_cv_type_unsigned_long_long=no)])
-    if test $ac_cv_type_unsigned_long_long = yes; then
-      AC_DEFINE(uintmax_t, unsigned long long)
-    else
-      AC_DEFINE(uintmax_t, unsigned long)
-    fi
+    AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
+    test $ac_cv_type_unsigned_long_long = yes \
+      && ac_type='unsigned long long' \
+      || ac_type='unsigned long'
+    AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
+[  Define to unsigned long or unsigned long long
+   if <inttypes.h> doesn't define.])
   fi
 ])