diff options
author | Jim Meyering <jim@meyering.net> | 2012-10-22 16:14:49 +0200 |
---|---|---|
committer | Jim Meyering <jim@meyering.net> | 2012-10-26 12:48:38 +0200 |
commit | df23dafc30d54164035281aec1f6ce14d0f4b0fc (patch) | |
tree | 78c472187cb4614cde335fdef589e44561742c5d /t/mkdirp-deprecation.sh | |
parent | 7411adcdad588acf2a167dd05e5a942fa752e90e (diff) | |
download | automake-df23dafc30d54164035281aec1f6ce14d0f4b0fc.tar.gz |
compat: reinstate AM_PROG_MKDIR_P, for gettext
Do not remove AM_PROG_MKDIR_P just yet.
gettext (latest from git) still AC_REQUIRE's AM_PROG_MKDIR_P via its
intl.m4 and po.m4 files, which are pulled into *many* projects.
When I try to build one of those projects (coreutils) using the latest
from automake.git/master, I see this failure:
$ aclocal -I m4
configure.ac:477: warning: AM_PROG_MKDIR_P is m4_require'd \
but not m4_defun'd
m4/po.m4:23: AM_PO_SUBDIRS is expanded from...
m4/gettext.m4:57: AM_GNU_GETTEXT is expanded from...
configure.ac:477: the top level
That is because AM_PROG_MKDIR_P was removed (via commit
v1.12-20-g8a1c64f) in preparation for the next release of automake.
* NEWS: Remove the paragraph that announced the removal of
AM_PROG_MKDIR_P.
* Makefile.am (dist_automake_ac_DATA): Add m4/mkdirp.m4.
* m4/mkdirp.m4: Re-add file.
* t/mkdirp-deprecation.sh: Likewise.
* t/list-of-tests.mk: Add it.
* automake.in: Restore removed code, and adjust comments, s/1.13/1.14/
to reflect new plan for removal.
* doc/automake.texi (Obsolete Macros): Restore the section, but
now with only one entry: the one for AM_PROG_MKDIR_P.
Diffstat (limited to 't/mkdirp-deprecation.sh')
-rwxr-xr-x | t/mkdirp-deprecation.sh | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/t/mkdirp-deprecation.sh b/t/mkdirp-deprecation.sh new file mode 100755 index 000000000..8482dea36 --- /dev/null +++ b/t/mkdirp-deprecation.sh @@ -0,0 +1,48 @@ +#! /bin/sh +# Copyright (C) 2012 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# Check that the AM_PROG_MKDIR_P macro is deprecated. It will be +# be removed in the next major Automake release. + +. ./defs || exit 1 + +echo AM_PROG_MKDIR_P >> configure.ac +: > Makefile.am + +grep_err () +{ + loc='^configure.ac:4:' + grep "$loc.*AM_PROG_MKDIR_P.*deprecated" stderr + grep "$loc.* use .*AC_PROG_MKDIR_P" stderr + grep "$loc.* use '\$(MKDIR_P)' instead of '\$(mkdir_p)'.*Makefile" stderr +} + +$ACLOCAL + +$AUTOCONF -Werror -Wobsolete 2>stderr && { cat stderr >&2; exit 1; } +cat stderr >&2 +grep_err + +$AUTOCONF -Werror -Wno-obsolete + +#AUTOMAKE_fails +#grep_err +AUTOMAKE_fails --verbose -Wnone -Wobsolete +grep_err + +$AUTOMAKE -Wno-obsolete + +: |