X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/aaa935591793937f354024fd094d2630d0399abc..refs/heads/wip:/m4/strtoumax.m4

diff --git a/m4/strtoumax.m4 b/m4/strtoumax.m4
index d69c1f79c7..fc582fcf44 100644
--- a/m4/strtoumax.m4
+++ b/m4/strtoumax.m4
@@ -1,5 +1,5 @@
-# strtoumax.m4 serial 9
-dnl Copyright (C) 2002-2004, 2006, 2009-2011 Free Software Foundation, Inc.
+# strtoumax.m4 serial 12
+dnl Copyright (C) 2002-2004, 2006, 2009-2014 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.
@@ -8,30 +8,21 @@ AC_DEFUN([gl_FUNC_STRTOUMAX],
 [
   AC_REQUIRE([gl_INTTYPES_H_DEFAULTS])
 
+  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
-
-    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)])
-
-    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
+  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_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
-  gl_FUNC_STRTOULL
 ])