X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fstrtoumax.m4;h=43236a03f106349c2eb2ef97832762615afa8d9b;hb=959d9cb463d992f9c5cc2fbeb54bf12eee2346f7;hp=84d42ff16fb6cff31897d5f7f747cc5c68072a80;hpb=c4da5fc90ff7ff8ef395c84be4b14e0a3d404cbb;p=gnulib.git

diff --git a/m4/strtoumax.m4 b/m4/strtoumax.m4
index 84d42ff16..43236a03f 100644
--- a/m4/strtoumax.m4
+++ b/m4/strtoumax.m4
@@ -1,10 +1,8 @@
-# strtoumax.m4 serial 4
-dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# strtoumax.m4 serial 7
+dnl Copyright (C) 2002, 2003, 2004, 2006, 2009 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],
 [
@@ -13,16 +11,16 @@ AC_DEFUN([gl_FUNC_STRTOUMAX],
   AC_REQUIRE([AC_PROG_EGREP])
 
   AC_CACHE_CHECK([whether <inttypes.h> defines strtoumax as a macro],
-    jm_cv_func_strtoumax_macro,
+    gl_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)])
+       gl_cv_func_strtoumax_macro=yes,
+       gl_cv_func_strtoumax_macro=no)])
 
-  if test "$jm_cv_func_strtoumax_macro" != yes; then
-    AC_REPLACE_FUNCS(strtoumax)
+  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
@@ -31,7 +29,6 @@ AC_DEFUN([gl_FUNC_STRTOUMAX],
 
 # Prerequisites of lib/strtoumax.c.
 AC_DEFUN([gl_PREREQ_STRTOUMAX], [
-  gl_AC_TYPE_UINTMAX_T
-  AC_CHECK_DECLS(strtoull)
-  AC_REQUIRE([gl_AC_TYPE_UNSIGNED_LONG_LONG])
+  AC_CHECK_DECLS([strtoull])
+  AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
 ])