Merge from trunk.

[bpt/emacs.git] / m4 / strtoumax.m4

diff --git a/m4/strtoumax.m4 b/m4/strtoumax.m4
index 58b310d..6a6aeb5 100644 (file)
--- a/m4/strtoumax.m4
+++ b/m4/strtoumax.m4
@@ -1,5 +1,5 @@
-# strtoumax.m4 serial 10
-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.
@@ -8,11 +8,11 @@ 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_CHECK_FUNCS([strtoumax])
   fi
 ])