build-sys: make DEJATOOL definition uncondictional

Fix to ./autogen.sh error bellow.

/usr/share/automake-1.11/am/dejagnu.am: DEJATOOL was already defined in condition LINUX, which is included in condition TRUE ...
testsuite/Makefile.am:6: ... `DEJATOOL' previously defined here

Reference: http://www.freelists.org/post/procps/procpsng-331-nearly-there,5
Reported-by: Jim Warner <james.warner@comcast.net>
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2011-12-03 14:03:48 +01:00
parent e7a0fe5bee
commit 03a1a42e28

View File

@ -1,9 +1,20 @@
AUTOMAKE_OPTIONS = dejagnu AUTOMAKE_OPTIONS = dejagnu
export DEJAGNU export DEJAGNU
# Programs that are expected across the board.
DEJATOOL =
if LINUX if LINUX
# Programs that are expected across the board # These should be in defined in 'across the board' scope, but are
test_tools = \ # temporarily disabled on other than linux systems, see commit
# 3d807ae853b8b4264da156065b34f1447658a8ba
DEJATOOL += \
kill \
pmap \
slabtop \
sysctl
DEJATOOL += \
free \ free \
pgrep \ pgrep \
pkill \ pkill \
@ -11,14 +22,9 @@ test_tools = \
pwdx \ pwdx \
uptime \ uptime \
vmstat \ vmstat \
w \ w
sysctl slabtop pmap kill
endif endif
DEJATOOL = $(test_tools)
EXTRA_DIST = \ EXTRA_DIST = \
free.test/free.exp \ free.test/free.exp \
kill.test/kill.exp \ kill.test/kill.exp \