This commit basically reverts v1.12.4-158-gdf23daf, re-instating
commit v1.12-20-g8a1c64f.
Support for the obsolescent 'AM_PROG_MKDIR_P' m4 macro has been
deprecated in the documentation and with runtime warnings since
Automake 1.12.1. Still, when we released Automake 1.13, we had
to delay that macro's removal, since at the time the last released
version of GNU gettext still AC_REQUIRE's AM_PROG_MKDIR_P via its
'intl.m4' and 'po.m4' files, which are pulled into *many* projects.
But it's now time to remove AM_PROG_MKDIR_P once and for all.
Projects still needing to work with older gettext releases will
be able to do so by adding a definition like
AC_DEFUN([AM_PROG_MKDIR_P], [AC_PROG_MKDIR_P([$@])])
to their 'acinclude.m4' file or to another local '*.m4' file.
* m4/mkdirp.m4: Delete.
* Makefile.am (dist_automake_ac_DATA): Remove it.
* automake.in (scan_autoconf_traces): Don't handle, nor warn about,
AM_PROG_MKDIR_P.
* doc/automake.texi (Obsolete Macros): Delete (it only spoke about
AM_PROG_MKDIR_P).
* t/gettext-macros.sh: Adjust.
* t/mkdirp-deprecation.sh: Delete.
* t/list-of-tests.mk: Don't list it.
Signed-off-by: Stefano Lattarini stefano.lattar...@gmail.com
---
I've pushed this patch in the temporary branch 'am-prog-mkdir-p-remove',
based off master, so that I can merge it in the 'ng/master' branch
(where AM_PROG_MKDIR_P has already been removed) to avoid spurious
merge conflicts with master. Once 1.13 is out and master becomes the
starting point of Automake 1.14, I'll merge the 'am-prog-mkdir-p-remove'
branch in master as well (since I plan to remove AM_PROG_MKDIR_P once
and for all in 1.14), and then I'll remove such temporary branch.
To stress an important point: this patch is *not* to be applied to the
upcoming 1.13.x release series; and will not be.
Regards,
Stefano
Makefile.am | 1 -
automake.in | 9 -
doc/automake.texi | 40
m4/mkdirp.m4| 31 ---
t/gettext-macros.sh | 13 +
t/list-of-tests.mk | 1 -
t/mkdirp-deprecation.sh | 48
7 files changed, 5 insertions(+), 138 deletions(-)
delete mode 100644 m4/mkdirp.m4
delete mode 100755 t/mkdirp-deprecation.sh
diff --git a/Makefile.am b/Makefile.am
index 0e959da..e629787 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -276,7 +276,6 @@ dist_automake_ac_DATA = \
m4/make.m4 \
m4/minuso.m4 \
m4/missing.m4 \
- m4/mkdirp.m4 \
m4/options.m4 \
m4/protos.m4 \
m4/python.m4 \
diff --git a/automake.in b/automake.in
index ba66d9a..8b9c775 100644
--- a/automake.in
+++ b/automake.in
@@ -5128,7 +5128,6 @@ sub scan_autoconf_traces ($)
AC_REQUIRE_AUX_FILE = 1,
AC_SUBST_TRACE = 1,
AM_AUTOMAKE_VERSION = 1,
-AM_PROG_MKDIR_P = 0, # FIXME: to be removed in 1.14
AM_CONDITIONAL = 2,
_AM_EXTRA_RECURSIVE_TARGETS = 1,
AM_GNU_GETTEXT = 0,
@@ -5284,14 +5283,6 @@ sub scan_autoconf_traces ($)
$seen_automake_version = 1;
}
- elsif ($macro eq 'AM_PROG_MKDIR_P') # FIXME: to be removed in 1.14
- {
- msg 'obsolete', $where, 'EOF';
-The 'AM_PROG_MKDIR_P' macro is deprecated, and will soon be removed.
-You should use the Autoconf-provided 'AC_PROG_MKDIR_P' macro instead,
-and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am files.
-EOF
- }
elsif ($macro eq 'AM_CONDITIONAL')
{
$configure_cond{$args[1]} = $where;
diff --git a/doc/automake.texi b/doc/automake.texi
index 92c3851..05fea5e 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -3880,7 +3880,6 @@ Automake ships with several Autoconf macros that you can
use from your
@menu
* Public Macros:: Macros that you can use.
-* Obsolete Macros:: Macros that will soon be removed.
* Private Macros:: Macros that you should not use.
@end menu
@@ -4047,45 +4046,6 @@ define @code{WITH_DMALLOC} and add @option{-ldmalloc} to
@code{LIBS}.
@end table
-@node Obsolete Macros
-@subsection Obsolete Macros
-@cindex obsolete macros
-@cindex autoupdate
-
-Although using some of the following macros was required in past
-releases, you should not use any of them in new code. @emph{All
-these macros will be removed in the next major Automake version};
-if you are still using them, running @command{autoupdate} should
-adjust your @file{configure.ac} automatically (@pxref{autoupdate
-Invocation, , Using @command{autoupdate} to Modernize
-@file{configure.ac}, autoconf, The Autoconf Manual}).
-@emph{Do it NOW!}
-
-@table @code
-
-@item AM_PROG_MKDIR_P
-@acindex AM_PROG_MKDIR_P
-@cindex @code{mkdir -p}, macro check
-@vindex MKDIR_P
-@vindex mkdir_p
-
-From Automake 1.8 to 1.9.6 this macro used to define the output
-variable @code{mkdir_p} to one of @code{mkdir -p}, @code{install-sh
