X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fstrtoimax.m4;h=d46673b2a8b9c12b1ec4df7f13d94d471666352d;hb=e4aa7fe91e3fa0e763e05ca9038c28d970928e4f;hp=9957637a65c8425ec7081e8eebee297c7180c696;hpb=82ff49b55425e14156a89f4d2ab4267409665f54;p=gnulib.git

diff --git a/m4/strtoimax.m4 b/m4/strtoimax.m4
index 9957637a6..d46673b2a 100644
--- a/m4/strtoimax.m4
+++ b/m4/strtoimax.m4
@@ -1,26 +1,18 @@
-# strtoimax.m4 serial 6
-dnl Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
+# strtoimax.m4 serial 9
+dnl Copyright (C) 2002-2004, 2006, 2009-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_STRTOIMAX],
 [
-  dnl Work around a bug of AC_EGREP_CPP in autoconf-2.57.
-  AC_REQUIRE([AC_PROG_CPP])
-  AC_REQUIRE([AC_PROG_EGREP])
+  AC_REQUIRE([gl_INTTYPES_H_DEFAULTS])
 
-  AC_CACHE_CHECK([whether <inttypes.h> defines strtoimax as a macro],
-    jm_cv_func_strtoimax_macro,
-    [AC_EGREP_CPP([inttypes_h_defines_strtoimax], [#include <inttypes.h>
-#ifdef strtoimax
- inttypes_h_defines_strtoimax
-#endif],
-       jm_cv_func_strtoimax_macro=yes,
-       jm_cv_func_strtoimax_macro=no)])
+  AC_CHECK_DECLS_ONCE([strtoimax])
+  if test "$ac_cv_have_decl_strtoimax" != yes; then
+    HAVE_DECL_STRTOIMAX=0
 
-  if test "$jm_cv_func_strtoimax_macro" != yes; then
-    AC_REPLACE_FUNCS(strtoimax)
+    AC_REPLACE_FUNCS([strtoimax])
     if test $ac_cv_func_strtoimax = no; then
       gl_PREREQ_STRTOIMAX
     fi
@@ -29,6 +21,6 @@ AC_DEFUN([gl_FUNC_STRTOIMAX],
 
 # Prerequisites of lib/strtoimax.c.
 AC_DEFUN([gl_PREREQ_STRTOIMAX], [
-  AC_CHECK_DECLS(strtoll)
+  AC_CHECK_DECLS([strtoll])
   AC_REQUIRE([AC_TYPE_LONG_LONG_INT])
 ])