From 1778ee9e7d0e150a37db66a0e51c1a56755aab4f Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 10 Apr 2010 22:40:52 +0200 Subject: [PATCH] Don't override improved macro from newer autoconf. --- ChangeLog | 7 +++++++ m4/gnulib-common.m4 | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c12889226..dd0264baa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-04-10 Bruno Haible + + 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 . + 2010-04-10 Jim Meyering 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 9cc519e76..54b251737 100644 --- 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. -- 2.11.0