From 03a1a42e28a8c4e2ccb00a3b87c01f3e35669af0 Mon Sep 17 00:00:00 2001 From: Sami Kerola Date: Sat, 3 Dec 2011 14:03:48 +0100 Subject: [PATCH] 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 Signed-off-by: Sami Kerola --- testsuite/Makefile.am | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am index 343cded5..fa1fc1a6 100644 --- a/testsuite/Makefile.am +++ b/testsuite/Makefile.am @@ -1,24 +1,30 @@ AUTOMAKE_OPTIONS = dejagnu export DEJAGNU -if LINUX -# Programs that are expected across the board -test_tools = \ - free \ - pgrep \ - pkill \ - ps \ - pwdx \ - uptime \ - vmstat \ - w \ - sysctl slabtop pmap kill +# Programs that are expected across the board. +DEJATOOL = +if LINUX +# 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 \