X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fstrtoimax.m4;h=a8d0b69c205dde0ce95a27f58e45474ce45d3901;hb=e2de8c10bd15a92eff786f8f51d0a322fbc402ee;hp=8d8298b99321428da08576383c5d3a1a25c7b716;hpb=b2e2010c7c902235b5efb5bd3c6529f61b093aa4;p=gnulib.git

diff --git a/m4/strtoimax.m4 b/m4/strtoimax.m4
index 8d8298b99..a8d0b69c2 100644
--- a/m4/strtoimax.m4
+++ b/m4/strtoimax.m4
@@ -1,30 +1,18 @@
-# strtoimax.m4 serial 7
-dnl Copyright (C) 2002, 2003, 2004, 2006, 2009, 2010 Free Software Foundation,
-dnl Inc.
+# strtoimax.m4 serial 11
+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],
-    gl_cv_func_strtoimax_macro,
-    [AC_EGREP_CPP([inttypes_h_defines_strtoimax], [#include <inttypes.h>
-#ifdef strtoimax
- inttypes_h_defines_strtoimax
-#endif],
-       gl_cv_func_strtoimax_macro=yes,
-       gl_cv_func_strtoimax_macro=no)])
-
-  if test "$gl_cv_func_strtoimax_macro" != yes; then
-    AC_REPLACE_FUNCS([strtoimax])
-    if test $ac_cv_func_strtoimax = no; then
-      gl_PREREQ_STRTOIMAX
-    fi
+  dnl On OSF/1 5.1 with cc, this function is declared but not defined.
+  AC_CHECK_FUNCS_ONCE([strtoimax])
+  AC_CHECK_DECLS_ONCE([strtoimax])
+  if test "$ac_cv_have_decl_strtoimax" != yes; then
+    HAVE_DECL_STRTOIMAX=0
   fi
 ])