Mercurial > hg > octave-nkf > gnulib-hg
changeset 13204:0802886fcee2
Don't override improved macro from newer autoconf.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Sat, 10 Apr 2010 22:40:52 +0200 |
parents | 0f51b742ab58 |
children | 16c9f09bd804 |
files | ChangeLog m4/gnulib-common.m4 |
diffstat | 2 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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 @@ # 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_DEFINE_UNQUOTED([restrict], [$ac_cv_c_restrict]) ;; esac ]) +]) # gl_BIGENDIAN # is like AC_C_BIGENDIAN, except that it can be AC_REQUIREd.