X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fstrtoumax.m4;h=9c8ff175d313819d8fd3ee5cbe937c82c5818b04;hb=cdceb2fe48e39f4fff25f6f4cb34bbab88c2856f;hp=1935250ed66f917c3676a1f49453e26cc13a8f9a;hpb=82ff49b55425e14156a89f4d2ab4267409665f54;p=gnulib.git

diff --git a/m4/strtoumax.m4 b/m4/strtoumax.m4
index 1935250ed..9c8ff175d 100644
--- a/m4/strtoumax.m4
+++ b/m4/strtoumax.m4
@@ -1,34 +1,28 @@
-# strtoumax.m4 serial 6
-dnl Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
+# strtoumax.m4 serial 12
+dnl Copyright (C) 2002-2004, 2006, 2009-2013 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_STRTOUMAX],
 [
-  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 strtoumax as a macro],
-    jm_cv_func_strtoumax_macro,
-    [AC_EGREP_CPP([inttypes_h_defines_strtoumax], [#include <inttypes.h>
-#ifdef strtoumax
- inttypes_h_defines_strtoumax
-#endif],
-       jm_cv_func_strtoumax_macro=yes,
-       jm_cv_func_strtoumax_macro=no)])
-
-  if test "$jm_cv_func_strtoumax_macro" != yes; then
-    AC_REPLACE_FUNCS(strtoumax)
-    if test $ac_cv_func_strtoumax = no; then
-      gl_PREREQ_STRTOUMAX
+  dnl On OSF/1 5.1 with cc, this function is declared but not defined.
+  AC_CHECK_FUNCS_ONCE([strtoumax])
+  AC_CHECK_DECLS_ONCE([strtoumax])
+  if test "$ac_cv_have_decl_strtoumax" = yes; then
+    if test "$ac_cv_func_strtoumax" != yes; then
+      # HP-UX 11.11 has "#define strtoimax(...) ..." but no function.
+      REPLACE_STRTOUMAX=1
     fi
+  else
+    HAVE_DECL_STRTOUMAX=0
   fi
 ])
 
 # Prerequisites of lib/strtoumax.c.
 AC_DEFUN([gl_PREREQ_STRTOUMAX], [
-  AC_CHECK_DECLS(strtoull)
+  AC_CHECK_DECLS([strtoull])
   AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
 ])