diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2014-04-21 17:12:41 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2014-04-22 21:48:44 +0100 |
| commit | 7bc592708cc65f30f8322c18624f48f19ffd726f (patch) | |
| tree | fca15f4dd0c42c1a4160910469dec5f58bed020d /t/auxdir-pr15981.sh | |
| parent | 5de7c3b47e04fe76980e9d8aa97ee5d17363140a (diff) | |
| download | automake-7bc592708cc65f30f8322c18624f48f19ffd726f.tar.gz | |
init: ensure $ac_aux_dir is defined before being used
Since we use '$ac_aux_dir' to define '$am_aux_dir', we need
to ensure the former has been initialized before we try to
define the latter, otherwise the definition:
am_aux_dir=`cd $ac_aux_dir && pwd`
will set '$am_aux_dir' to '$HOME', likely causing weird and
unexpected behaviours.
This change fixes automake bug#15981.
* m4/auxdir.m4 (AM_AUX_DIR_EXPAND): AC_REQUIRE expansion
of 'AC_CONFIG_AUX_DIR_DEFAULT'. Fix redundant comment and
AC_PREREQ, add extra quoting around '$ac_aux_dir'.
* t/auxdir-pr15981.sh: New test.
* t/auxdir-cc-pr15981.sh: Likewise.
* t/list-of-tests.mk (handwritten_TESTS): Add them.
* THANKS, NEWS: Update.
* bin/automake.in: Fix a harmless typo in comments, that
I happened to notice while writing this patch.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/auxdir-pr15981.sh')
| -rw-r--r-- | t/auxdir-pr15981.sh | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/t/auxdir-pr15981.sh b/t/auxdir-pr15981.sh new file mode 100644 index 000000000..f09d551fd --- /dev/null +++ b/t/auxdir-pr15981.sh @@ -0,0 +1,39 @@ +#! /bin/sh +# Copyright (C) 2014 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/>. + +# AM_AUX_DIR_EXPAND should ensure $ac_aux_dir is properly initialized. +# Issue revealed by related automake bug#15981. + +. test-init.sh + +cat > configure.ac <<'END' +AC_INIT([test], [0.0]) +AM_AUX_DIR_EXPAND +printf '%s\n' "ac_aux_dir: '$ac_aux_dir'" +printf '%s\n' "am_aux_dir: '$am_aux_dir'" +test "$ac_aux_dir" = . || AS_EXIT([1]) +test "$am_aux_dir" = "`pwd`" || AS_EXIT([1]) +AS_EXIT([0]) +END + +$ACLOCAL +$AUTOCONF + +test -f install-sh # sanity check + +./configure + +: |