X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fstrtoull.m4;h=57ef75423df807bfc8fd115f845f63988f2c92fb;hb=1bb384c44db25aef8f8b455cef22af32d8401abc;hp=398a86d1876d018a4dba135218eaa611985abccb;hpb=44d7c1c1f004fa9bfb8ec3948de2671a7958cf5b;p=gnulib.git

diff --git a/m4/strtoull.m4 b/m4/strtoull.m4
index 398a86d18..57ef75423 100644
--- a/m4/strtoull.m4
+++ b/m4/strtoull.m4
@@ -1,18 +1,19 @@
-# strtoull.m4 serial 3
-dnl Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+# strtoull.m4 serial 7
+dnl Copyright (C) 2002, 2004, 2006, 2008-2011 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([gl_FUNC_STRTOULL],
 [
+  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
   dnl We don't need (and can't compile) the replacement strtoull
-  dnl unless the type 'unsigned long long' exists.
-  AC_REQUIRE([gl_AC_TYPE_UNSIGNED_LONG_LONG])
-  if test "$ac_cv_type_unsigned_long_long" = yes; then
-    AC_REPLACE_FUNCS(strtoull)
+  dnl unless the type 'unsigned long long int' exists.
+  AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
+  if test "$ac_cv_type_unsigned_long_long_int" = yes; then
+    AC_CHECK_FUNCS([strtoull])
     if test $ac_cv_func_strtoull = no; then
-      gl_PREREQ_STRTOULL
+      HAVE_STRTOULL=0
     fi
   fi
 ])