projects
/
gnulib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4e5f703
)
Don't override improved macro from newer autoconf.
author
Bruno Haible
<bruno@clisp.org>
Sat, 10 Apr 2010 20:40:52 +0000
(22:40 +0200)
committer
Bruno Haible
<bruno@clisp.org>
Sat, 10 Apr 2010 20:41:33 +0000
(22:41 +0200)
ChangeLog
patch
|
blob
|
history
m4/gnulib-common.m4
patch
|
blob
|
history
diff --git
a/ChangeLog
b/ChangeLog
index
c128892
..
dd0264b
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
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
9cc519e
..
54b2517
100644
(file)
--- a/
m4/gnulib-common.m4
+++ b/
m4/gnulib-common.m4
@@
-1,4
+1,4
@@
-# gnulib-common.m4 serial 1
8
+# gnulib-common.m4 serial 1
9
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,
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.
# 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
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
])
*) AC_DEFINE_UNQUOTED([restrict], [$ac_cv_c_restrict]) ;;
esac
])
+])
# gl_BIGENDIAN
# is like AC_C_BIGENDIAN, except that it can be AC_REQUIREd.
# gl_BIGENDIAN
# is like AC_C_BIGENDIAN, except that it can be AC_REQUIREd.