X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=m4%2Fstrtoumax.m4;h=6a6aeb5dae18c7e2ca431621c679ac82324fbb36;hb=daa269958ad8d50ef8154ccb65e58acaf7a6dd99;hp=448c4d9b777eacd5ac2b19ad3335b037c88a471f;hpb=1a44d77d50f4fb37c0410eed04b82303624ea2ec;p=debian%2Ftar

diff --git a/m4/strtoumax.m4 b/m4/strtoumax.m4
index 448c4d9b..6a6aeb5d 100644
--- a/m4/strtoumax.m4
+++ b/m4/strtoumax.m4
@@ -1,25 +1,18 @@
-# strtoumax.m4 serial 8
-dnl Copyright (C) 2002-2004, 2006, 2009-2011 Free Software Foundation, Inc.
+# strtoumax.m4 serial 11
+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],
 [
-  AC_CACHE_CHECK([whether <inttypes.h> defines strtoumax as a macro],
-    gl_cv_func_strtoumax_macro,
-    [AC_EGREP_CPP([inttypes_h_defines_strtoumax], [#include <inttypes.h>
-#ifdef strtoumax
- inttypes_h_defines_strtoumax
-#endif],
-       gl_cv_func_strtoumax_macro=yes,
-       gl_cv_func_strtoumax_macro=no)])
+  AC_REQUIRE([gl_INTTYPES_H_DEFAULTS])
 
-  if test "$gl_cv_func_strtoumax_macro" != yes; then
-    AC_REPLACE_FUNCS([strtoumax])
-    if test $ac_cv_func_strtoumax = no; then
-      gl_PREREQ_STRTOUMAX
-    fi
+  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
+    HAVE_DECL_STRTOUMAX=0
   fi
 ])