diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-12-14 10:43:21 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-12-14 10:43:21 +0100 |
| commit | de736a2222a4ffe7dfb82b60ba2fa10192548a31 (patch) | |
| tree | 4ecc07aeb3c167ec021bc1a33ca603ef0ca3c628 /t/ax | |
| parent | d7a59576910338592410afd23bb726348fa59000 (diff) | |
| parent | 33263a0fec525a7dfb0b0b0c0c21bb9d35b1d12f (diff) | |
| download | automake-de736a2222a4ffe7dfb82b60ba2fa10192548a31.tar.gz | |
Merge branch 'maint'
* maint:
docs: fixlet about xz compression levels and command line options
maint: more files excluded in 'update-copyright'
maint: adapt 'update-copyright' recipe to the new $(FETCHFILES) format
HACKING: update instructions to update the manuals at www.gnu.org
maint: add an explicative comment in Makefile
maint: factor out the name of the dir where web manuals are generated
maint: rename rules to build/upload web manuals
cosmetic: minor variable and rules reordering in Makefile.am
docs: build the web manuals for CVS in the builddir, not in the srcdir
release: automate uploading of web manuals in CVS
docs: AM_CFLAGS: remove reference to non-existing "more detailed" desc
tests: avoid two spurious failures on FreeBSD
tests: improve 'pkg-config' requirement
Diffstat (limited to 't/ax')
| -rw-r--r-- | t/ax/am-test-lib.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/t/ax/am-test-lib.sh b/t/ax/am-test-lib.sh index 6d7c69b04..ba2101220 100644 --- a/t/ax/am-test-lib.sh +++ b/t/ax/am-test-lib.sh @@ -787,14 +787,14 @@ process_requirements () for am_tool in $*; do require_tool $am_tool done + # We might need extra m4 macros, e.g., for Libtool or Gettext. + for am_tool in gettext libtool pkg-config; do + case " $required " in + # The lack of whitespace after $am_tool is intended. + *" $am_tool"*) . ./t/$am_tool-macros.dir/get.sh;; + esac + done am_tool=; unset am_tool - # We might need extra macros, e.g., from Libtool or Gettext. - case " $required " in - *\ libtool*) . ./t/libtool-macros.dir/get.sh;; - esac - case " $required " in - *\ gettext*) . ./t/gettext-macros.dir/get.sh;; - esac } ## ---------------------------------------------------------------- ## |