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 /m4 | |
| 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 'm4')
| -rw-r--r-- | m4/auxdir.m4 | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/m4/auxdir.m4 b/m4/auxdir.m4 index 1f8614d47..93fc22521 100644 --- a/m4/auxdir.m4 +++ b/m4/auxdir.m4 @@ -45,8 +45,7 @@ # configured tree to be moved without reconfiguration. AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` ]) |