X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Fstrtoll.m4;h=065047a66b49e7119415caf98f648fc8ec6ff83b;hb=edb5054087db6afdc3ab2cc645ce2d891ee88c6d;hp=76f80654907b819bb0b86a43b2aade99ce25bb3e;hpb=44d7c1c1f004fa9bfb8ec3948de2671a7958cf5b;p=gnulib.git

diff --git a/m4/strtoll.m4 b/m4/strtoll.m4
index 76f806549..065047a66 100644
--- a/m4/strtoll.m4
+++ b/m4/strtoll.m4
@@ -1,17 +1,20 @@
-# strtoll.m4 serial 3
-dnl Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+# strtoll.m4 serial 6
+dnl Copyright (C) 2002, 2004, 2006, 2008, 2009, 2010 Free Software Foundation,
+dnl 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_STRTOLL],
 [
+  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
   dnl We don't need (and can't compile) the replacement strtoll
-  dnl unless the type 'long long' exists.
-  AC_REQUIRE([gl_AC_TYPE_LONG_LONG])
-  if test "$ac_cv_type_long_long" = yes; then
-    AC_REPLACE_FUNCS(strtoll)
+  dnl unless the type 'long long int' exists.
+  AC_REQUIRE([AC_TYPE_LONG_LONG_INT])
+  if test "$ac_cv_type_long_long_int" = yes; then
+    AC_REPLACE_FUNCS([strtoll])
     if test $ac_cv_func_strtoll = no; then
+      HAVE_STRTOLL=0
       gl_PREREQ_STRTOLL
     fi
   fi