X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fstrtoimax.m4;h=8d8298b99321428da08576383c5d3a1a25c7b716;hb=d0ed135f8b494a0adf869a311c7bdc1d9d03f050;hp=7a338f2aa89c376c4326d1442b9a2c804f3bae16;hpb=1dbb5967ee7e786d08d728e6f53f3b67026c1e7a;p=gnulib.git

diff --git a/m4/strtoimax.m4 b/m4/strtoimax.m4
index 7a338f2aa..8d8298b99 100644
--- a/m4/strtoimax.m4
+++ b/m4/strtoimax.m4
@@ -1,10 +1,9 @@
-# strtoimax.m4 serial 2
-dnl Copyright (C) 2002-2003 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.
+# strtoimax.m4 serial 7
+dnl Copyright (C) 2002, 2003, 2004, 2006, 2009, 2010 Free Software Foundation,
+dnl 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_STRTOIMAX],
 [
@@ -13,16 +12,16 @@ AC_DEFUN([gl_FUNC_STRTOIMAX],
   AC_REQUIRE([AC_PROG_EGREP])
 
   AC_CACHE_CHECK([whether <inttypes.h> defines strtoimax as a macro],
-    jm_cv_func_strtoimax_macro,
+    gl_cv_func_strtoimax_macro,
     [AC_EGREP_CPP([inttypes_h_defines_strtoimax], [#include <inttypes.h>
 #ifdef strtoimax
  inttypes_h_defines_strtoimax
 #endif],
-       jm_cv_func_strtoimax_macro=yes,
-       jm_cv_func_strtoimax_macro=no)])
+       gl_cv_func_strtoimax_macro=yes,
+       gl_cv_func_strtoimax_macro=no)])
 
-  if test "$jm_cv_func_strtoimax_macro" != yes; then
-    AC_REPLACE_FUNCS(strtoimax)
+  if test "$gl_cv_func_strtoimax_macro" != yes; then
+    AC_REPLACE_FUNCS([strtoimax])
     if test $ac_cv_func_strtoimax = no; then
       gl_PREREQ_STRTOIMAX
     fi
@@ -31,9 +30,6 @@ AC_DEFUN([gl_FUNC_STRTOIMAX],
 
 # Prerequisites of lib/strtoimax.c.
 AC_DEFUN([gl_PREREQ_STRTOIMAX], [
-  jm_AC_TYPE_INTMAX_T
-  AC_CHECK_HEADERS_ONCE(stdlib.h)
-  AC_CHECK_DECLS_ONCE(strtol)
-  AC_CHECK_DECLS(strtoll)
-  AC_REQUIRE([jm_AC_TYPE_LONG_LONG])
+  AC_CHECK_DECLS([strtoll])
+  AC_REQUIRE([AC_TYPE_LONG_LONG_INT])
 ])