From ba3be00a5546579e80323430a57a3aedaedc6156 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 20 Dec 2012 22:10:08 -0800 Subject: [PATCH] AC_PROG_MKDIR_P: don't workaround if not buggy * m4/gnulib-common.m4 (AC_PROG_MKDIR_P): Define only for Autoconf versions before 2.62. (AC_C_RESTRICT): Use documented AC_AUTOCONF_VERSION, not undocumented m4_PACKAGE_VERSION, for consistency with the abovementioned change to AC_PROG_MKDIR_P. This should suffice since we're checking for 2.62 or later, and AC_AUTOCONF_VERSION was introduced in 2.62. --- ChangeLog | 11 +++++++++++ m4/gnulib-common.m4 | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 427581ac0f..62b6e51f83 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2012-12-20 Paul Eggert + + AC_PROG_MKDIR_P: don't workaround if not buggy + * m4/gnulib-common.m4 (AC_PROG_MKDIR_P): + Define only for Autoconf versions before 2.62. + (AC_C_RESTRICT): Use documented AC_AUTOCONF_VERSION, not + undocumented m4_PACKAGE_VERSION, for consistency with the + abovementioned change to AC_PROG_MKDIR_P. This should suffice + since we're checking for 2.62 or later, and AC_AUTOCONF_VERSION + was introduced in 2.62. + 2012-12-15 Ben Pfaff New 'c-*printf' modules for formatted output in C locale. diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4 index 15d2b2b3de..01796bd835 100644 --- a/m4/gnulib-common.m4 +++ b/m4/gnulib-common.m4 @@ -294,6 +294,7 @@ 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],[ 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 +305,14 @@ 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],[ +m4_if(m4_version_compare(m4_defn([AC_AUTOCONF_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 -- 2.39.5