diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-12-23 22:24:08 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-12-23 22:24:08 -0800 |
| commit | 219023c4347abfc9461f2d99245de3c4aa7f1e64 (patch) | |
| tree | 02185574d64e82c51c123a07ac0c1104f15285fe /m4 | |
| parent | 087d8265e4f5a6116b0ee02d2e1854f5409bda4d (diff) | |
| download | emacs-219023c4347abfc9461f2d99245de3c4aa7f1e64.tar.gz | |
Merge from gnulib.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/gnulib-common.m4 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4 index 15d2b2b3dea..f3ba8d56b1f 100644 --- a/m4/gnulib-common.m4 +++ b/m4/gnulib-common.m4 @@ -294,6 +294,8 @@ Amsterdam # for interoperability with automake-1.9.6 from autoconf-2.62. # Remove this macro when we can assume autoconf >= 2.62 or # autoconf >= 2.60 && automake >= 1.10. +# AC_AUTOCONF_VERSION was introduced in 2.62, so use that as the witness. +m4_ifndef([AC_AUTOCONF_VERSION],[ m4_ifdef([AC_PROG_MKDIR_P], [ dnl For automake-1.9.6 && autoconf < 2.62: Ensure MKDIR_P is AC_SUBSTed. m4_define([AC_PROG_MKDIR_P], @@ -304,13 +306,15 @@ m4_ifdef([AC_PROG_MKDIR_P], [ [AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake MKDIR_P='$(mkdir_p)' AC_SUBST([MKDIR_P])])]) +]) # AC_C_RESTRICT # This definition overrides the AC_C_RESTRICT macro from autoconf 2.60..2.61, # 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_AUTOCONF_VERSION was introduced in 2.62, so use that as the witness. +m4_ifndef([AC_AUTOCONF_VERSION],[ AC_DEFUN([AC_C_RESTRICT], [AC_CACHE_CHECK([for C/C++ restrict keyword], [ac_cv_c_restrict], [ac_cv_c_restrict=no |