Don't override improved macro from newer autoconf.

diff --git a/ChangeLog b/ChangeLog
index c12889226493e1946da1359b6d04c7b7e6905a1e..dd0264baaf7ae8ea1cbcd89912ebd8aa637092e6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-10  Bruno Haible  <bruno@clisp.org>
+
+       Don't override improved macro from newer autoconf.
+       * m4/gnulib-common.m4 (AC_C_RESTRICT): Don't define for
+       autoconf >= 2.62.
+       Reported by Joel E. Denny <jdenny@clemson.edu>.
+
 2010-04-10  Jim Meyering  <meyering@redhat.com>
 
        maint.mk: new syntax-check rule: prohibit empty lines at end of file

diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4
index 9cc519e765ea653055cf1ea21a30a53db95d87df..54b251737c59d2bd925de55292388272a1c71781 100644 (file)
--- a/m4/gnulib-common.m4
+++ b/m4/gnulib-common.m4
@@ -1,4 +1,4 @@
-# gnulib-common.m4 serial 18
+# gnulib-common.m4 serial 19
 dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -132,6 +132,7 @@ m4_ifdef([AC_PROG_MKDIR_P], [
 # so that mixed use of GNU C and GNU C++ and mixed use of Sun C and Sun C++
 # works.
 # This definition can be removed once autoconf >= 2.62 can be assumed.
+m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.62]),[-1],[
 AC_DEFUN([AC_C_RESTRICT],
 [AC_CACHE_CHECK([for C/C++ restrict keyword], [ac_cv_c_restrict],
   [ac_cv_c_restrict=no
@@ -169,6 +170,7 @@ AC_DEFUN([AC_C_RESTRICT],
    *)  AC_DEFINE_UNQUOTED([restrict], [$ac_cv_c_restrict]) ;;
  esac
 ])
+])
 
 # gl_BIGENDIAN
 # is like AC_C_BIGENDIAN, except that it can be AC_REQUIREd.