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>

diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 343cded5a388a13eb8c98476740a5121929e28d8..fa1fc1a64646a6410784aec7a03414d799793a38 100644 (file)
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -1,24 +1,30 @@
 AUTOMAKE_OPTIONS = dejagnu
 export DEJAGNU
 
+# Programs that are expected across the board.
+DEJATOOL =
+
 if LINUX
-# Programs that are expected across the board
-test_tools = \
-                  free \
-                  pgrep \
-                  pkill \
-                  ps \
-                  pwdx \
-                  uptime \
-                  vmstat \
-                  w \
-                  sysctl slabtop pmap kill
+# These should be in defined in 'across the board' scope, but are
+# temporarily disabled on other than linux systems, see commit
+# 3d807ae853b8b4264da156065b34f1447658a8ba
+DEJATOOL += \
+       kill \
+       pmap \
+       slabtop \
+       sysctl
 
+DEJATOOL += \
+       free \
+       pgrep \
+       pkill \
+       ps \
+       pwdx \
+       uptime \
+       vmstat \
+       w
 endif
 
-DEJATOOL = $(test_tools)
-               
-       
 EXTRA_DIST = \
                         free.test/free.exp \
                         kill.test/kill.exp \