diff options
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | doc/automake.texi | 17 | ||||
| -rw-r--r-- | lib/am/distdir.am | 11 | ||||
| -rw-r--r-- | t/distcheck-no-prefix-or-srcdir-override.sh | 60 | ||||
| -rw-r--r-- | t/list-of-tests.mk | 1 |
5 files changed, 83 insertions, 9 deletions
@@ -108,6 +108,9 @@ New in 1.14.1: * Bugs fixed: + - The user is no longer allowed to override the --srcdir nor the --prefix + configure options used by "make distcheck" (bug#14991). + - Fixed a gross inefficiency in the recipes for installing byte-compiled python files, that was causing an O(N^2) performance on the number N of files, instead of the expected O(N) performance. Note that this bug diff --git a/doc/automake.texi b/doc/automake.texi index 62728d4cf..cd33ad7c3 100644 --- a/doc/automake.texi +++ b/doc/automake.texi @@ -8556,11 +8556,18 @@ to supply additional flags to @command{configure}, define them in the @file{Makefile.am}. The user can still extend or override the flags provided there by defining the @code{DISTCHECK_CONFIGURE_FLAGS} variable, on the command line when invoking @command{make}. - -Still, developers are encouraged to strive to make their code buildable -without requiring any special configure option; thus, in general, you -shouldn't define @code{AM_DISTCHECK_CONFIGURE_FLAGS}. However, there -might be few scenarios in which the use of this variable is justified. +@c See automake bug#14991 for more details about how the following holds. +It's worth nothing that @command{make distcheck} needs complete control +over the @command{configure} options @option{--srcdir} and +@option{--prefix}, so those options cannot be overridden by +@code{AM_DISTCHECK_CONFIGURE_FLAGS} nor by +@code{DISTCHECK_CONFIGURE_FLAGS}. + +Also note that developers are encouraged to strive to make their code +buildable without requiring any special configure option; thus, in +general, you shouldn't define @code{AM_DISTCHECK_CONFIGURE_FLAGS}. +However, there might be few scenarios in which the use of this variable +is justified. GNU @command{m4} offers an example. GNU @command{m4} configures by default with its experimental and seldom used "changeword" feature disabled; so in its case it is useful to have @command{make distcheck} diff --git a/lib/am/distdir.am b/lib/am/distdir.am index f3549876e..a8ad63cef 100644 --- a/lib/am/distdir.am +++ b/lib/am/distdir.am @@ -452,13 +452,16 @@ distcheck: dist ## so be sure to 'cd' back to the original directory after this. && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + && ../configure \ ?GETTEXT? --with-included-gettext \ -## Additional flags for configure. Keep this last in the configure -## invocation so the developer and user can override previous options, -## and let the user's flags take precedence over the developer's ones. +## Additional flags for configure. $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ +## At the moment, the code doesn't actually support changes in these --srcdir +## and --prefix values, so don't allow them to be overridden by the user or +## the developer. That used to be allowed, and caused issues in practice +## (in corner-case usages); see automake bug#14991. + --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ diff --git a/t/distcheck-no-prefix-or-srcdir-override.sh b/t/distcheck-no-prefix-or-srcdir-override.sh new file mode 100644 index 000000000..9b9a56fb8 --- /dev/null +++ b/t/distcheck-no-prefix-or-srcdir-override.sh @@ -0,0 +1,60 @@ +#! /bin/sh +# Copyright (C) 2013 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 "make distcheck" overrides any --srcdir or --prefix flag +# (mistakenly) defined in $(AM_DISTCHECK_CONFIGURE_FLAGS) or +# $(DISTCHECK_CONFIGURE_FLAGS). See automake bug#14991. + +. test-init.sh + +echo AC_OUTPUT >> configure.ac + +orig_cwd=$(pwd); export orig_cwd + +cat > Makefile.am << 'END' +# configure should choke on non-absolute prefix or non-existent +# srcdir. We'll sanity-check that later. +AM_DISTCHECK_CONFIGURE_FLAGS = --srcdir am-src --prefix am-pfx +END + +# Same comments as above applies. +DISTCHECK_CONFIGURE_FLAGS='--srcdir user-src --prefix user-pfx' +export DISTCHECK_CONFIGURE_FLAGS + +$ACLOCAL +$AUTOMAKE +$AUTOCONF + +# Sanity check: configure should choke on non-absolute prefix +# or non-existent srcdir. +./configure --prefix foobar 2>stderr && { cat stderr >&2; exit 99; } +cat stderr >&2 +grep "expected an absolute directory name for --prefix" stderr || exit 99 +./configure --srcdir foobar 2>stderr && { cat stderr >&2; exit 99; } +cat stderr >&2 +grep "cannot find sources.* in foobar" stderr || exit 99 + +./configure +run_make -E -O distcheck +test ! -s stderr +# Sanity check: the flags have been actually seen. +$PERL -e 'undef $/; $_ = <>; s/ \\\n/ /g; print;' <stdout >t +grep '/configure .* --srcdir am-src' t || exit 99 +grep '/configure .* --prefix am-pfx' t || exit 99 +grep '/configure .* --srcdir user-src' t || exit 99 +grep '/configure .* --prefix user-pfx' t || exit 99 + +: diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk index 9069b08bf..75f303a24 100644 --- a/t/list-of-tests.mk +++ b/t/list-of-tests.mk @@ -422,6 +422,7 @@ t/distcheck-hook2.sh \ t/distcheck-writable-srcdir.sh \ t/distcheck-missing-m4.sh \ t/distcheck-outdated-m4.sh \ +t/distcheck-no-prefix-or-srcdir-override.sh \ t/distcheck-override-infodir.sh \ t/distcheck-pr9579.sh \ t/distcheck-pr10470.sh \ |