[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] AC_PROG_MKDIR_P: don't workaround if not buggy
From: |
Paul Eggert |
Subject: |
Re: [PATCH] AC_PROG_MKDIR_P: don't workaround if not buggy |
Date: |
Fri, 21 Dec 2012 08:16:46 -0800 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 |
On 12/21/12 06:02, Eric Blake wrote:
> But that gives me an idea for a simpler solution that DOES work with 2.59:
Thanks for the bug report and suggestion -- I pushed this:
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2012-12-21 Paul Eggert <address@hidden>
+
+ AC_PROG_MKDIR_P: port workaround to pre-2.62 Autoconf
+ * m4/gnulib-common.m4 (AC_PROG_MKDIR_P, AC_C_RESTRICT):
+ Use m4_ifndef([AC_AUTOCONF_VERSION], ...), not
+ m4_if(m4_version_compare(m4_defn([AC_AUTOCONF_VERSION]),[2.62]),[-1],
+ ...), as the latter is fatal with older Autoconfs.
+ Problem reported and fix suggested by Eric Blake in thread starting at
+ <http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00097.html>.
+
2012-12-20 Paul Eggert <address@hidden>
AC_PROG_MKDIR_P: don't workaround if not buggy
diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4
index 01796bd..f3ba8d5 100644
--- a/m4/gnulib-common.m4
+++ b/m4/gnulib-common.m4
@@ -294,7 +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.
-m4_if(m4_version_compare(m4_defn([AC_AUTOCONF_VERSION]),[2.62]),[-1],[
+# 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],
@@ -312,7 +313,8 @@ 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([AC_AUTOCONF_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
--
1.7.11.7