X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fstrtoimax.m4;h=e82e7cd08f8b5ca9915f2f168c8416e2252cac80;hb=9436b51b876432bb26c2345e138e8ddd7c6a7fb2;hp=914e180bc38fcd756877b264befbcd2daf564f1e;hpb=44d7c1c1f004fa9bfb8ec3948de2671a7958cf5b;p=gnulib.git

diff --git a/m4/strtoimax.m4 b/m4/strtoimax.m4
index 914e180bc..e82e7cd08 100644
--- a/m4/strtoimax.m4
+++ b/m4/strtoimax.m4
@@ -1,26 +1,22 @@
-# strtoimax.m4 serial 5
-dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+# strtoimax.m4 serial 8
+dnl Copyright (C) 2002-2004, 2006, 2009-2011 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_STRTOIMAX],
 [
-  dnl Work around a bug of AC_EGREP_CPP in autoconf-2.57.
-  AC_REQUIRE([AC_PROG_CPP])
-  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
@@ -29,7 +25,6 @@ AC_DEFUN([gl_FUNC_STRTOIMAX],
 
 # Prerequisites of lib/strtoimax.c.
 AC_DEFUN([gl_PREREQ_STRTOIMAX], [
-  gl_AC_TYPE_INTMAX_T
-  AC_CHECK_DECLS(strtoll)
-  AC_REQUIRE([gl_AC_TYPE_LONG_LONG])
+  AC_CHECK_DECLS([strtoll])
+  AC_REQUIRE([AC_TYPE_LONG_LONG_INT])
 ])