Merge branch 'dfsg-orig' into dfsg-debian

[debian/tar] / m4 / strtoimax.m4

diff --git a/m4/strtoimax.m4 b/m4/strtoimax.m4
index 6ed66c96876e5574349587d391e097aefdcd9a77..e82e7cd08f8b5ca9915f2f168c8416e2252cac80 100644 (file)
--- a/m4/strtoimax.m4
+++ b/m4/strtoimax.m4
@@ -1,15 +1,11 @@
-# strtoimax.m4 serial 6
-dnl Copyright (C) 2002, 2003, 2004, 2006 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],
     gl_cv_func_strtoimax_macro,
     [AC_EGREP_CPP([inttypes_h_defines_strtoimax], [#include <inttypes.h>
@@ -20,7 +16,7 @@ AC_DEFUN([gl_FUNC_STRTOIMAX],
        gl_cv_func_strtoimax_macro=no)])
 
   if test "$gl_cv_func_strtoimax_macro" != yes; then
-    AC_REPLACE_FUNCS(strtoimax)
+    AC_REPLACE_FUNCS([strtoimax])
     if test $ac_cv_func_strtoimax = no; then
       gl_PREREQ_STRTOIMAX
     fi
@@ -29,6 +25,6 @@ AC_DEFUN([gl_FUNC_STRTOIMAX],
 
 # Prerequisites of lib/strtoimax.c.
 AC_DEFUN([gl_PREREQ_STRTOIMAX], [
-  AC_CHECK_DECLS(strtoll)
+  AC_CHECK_DECLS([strtoll])
   AC_REQUIRE([AC_TYPE_LONG_LONG_INT])
 ])