X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fuintmax_t.m4;h=347863e5218b05826bcf38a1aa3ff7e4852b12e3;hb=365c522e3a5b3ae36005ab1d7f3a8bfbb0a9dee7;hp=b9855a6f836db8d99990c5c2d7fb203ae4b2d9eb;hpb=a08ea6a161d963ce02a6abd48c7f00ea794d2e39;p=gnulib.git

diff --git a/m4/uintmax_t.m4 b/m4/uintmax_t.m4
index b9855a6f8..347863e52 100644
--- a/m4/uintmax_t.m4
+++ b/m4/uintmax_t.m4
@@ -1,23 +1,22 @@
-#serial 1
+#serial 3
 
 dnl From Paul Eggert.
 
+AC_PREREQ(2.13)
+
 # Define uintmax_t to `unsigned long' or `unsigned long long'
 # if <inttypes.h> does not exist.
 
 AC_DEFUN(jm_AC_TYPE_UINTMAX_T,
 [
-  AC_REQUIRE([jm_AC_HEADER_INTTTYPES_H])
+  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
 ])