2 files changed, 7 insertions, 8 deletions

diff --git a/configure.in b/configure.in
index d0bd0efc..63ee56c3 100644
--- a/configure.in
+++ b/configure.in
@@ -156,7 +156,7 @@ AC_SUBST(MATHLIBS)
 
 dnl Check for libtap, to run perl-like tests
 AC_CHECK_LIB(tap, plan_tests, 
-        EXTRA_TEST="test_utils test_disk test_tcp test_cmd test_base64"
+        EXTRA_TEST="test_utils test_disk test_tcp test_cmd"
         AC_SUBST(EXTRA_TEST)
         )
 
@@ -566,6 +566,7 @@ then
         ac_cv_ps_command="$PATH_TO_PS axwo 'stat uid pid ppid vsz rss pcpu comm args'"
         ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
         ac_cv_ps_cols=9
+        ac_cv_ps_test="ps_axwo.debian"
         AC_MSG_RESULT([$ac_cv_ps_command])
 
 dnl For OpenBSD 3.2 & 3.3. Must come before ps -weo
@@ -578,6 +579,7 @@ then
         ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid vsz rss pcpu comm args'"
         ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
         ac_cv_ps_cols=9
+        ac_cv_ps_test="ps-axwo.darwin"
         AC_MSG_RESULT([$ac_cv_ps_command])
 
 dnl Some *BSDs have different format for ps. This is mainly to catch FreeBSD 4. 
@@ -808,6 +810,8 @@ if test -n "$ac_cv_ps_varlist" ; then
                 [Format string for scanning ps output in check_procs])
         AC_DEFINE_UNQUOTED(PS_COLS,$ac_cv_ps_cols,
                 [Number of columns in ps command])
+        AC_DEFINE_UNQUOTED(PS_TEST,$ac_cv_ps_test,
+                [Test file to check parsing])
         EXTRAS="$EXTRAS check_procs check_nagios"
         if echo "$ac_cv_ps_varlist" | grep "procetime" >/dev/null; then
                 AC_DEFINE(PS_USES_PROCETIME,"yes",
diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am
index bd25ccfe..784447ea 100644
--- a/lib/tests/Makefile.am
+++ b/lib/tests/Makefile.am
@@ -7,9 +7,9 @@ check_PROGRAMS = @EXTRA_TEST@
 
 INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins
 
-EXTRA_PROGRAMS = test_utils test_disk test_tcp test_cmd test_base64
+EXTRA_PROGRAMS = test_utils test_disk test_tcp test_cmd
 
-EXTRA_DIST = test_utils.t test_disk.t test_tcp.t test_cmd.t test_base64.t
+EXTRA_DIST = test_utils.t test_disk.t test_tcp.t test_cmd.t
 
 LIBS = @LIBINTL@
 
@@ -33,11 +33,6 @@ test_cmd_CFLAGS = -g -I..
 test_cmd_LDFLAGS = -L/usr/local/lib -ltap
 test_cmd_LDADD = ../utils_cmd.o ../utils_base.o
 
-test_base64_SOURCES = test_base64.c
-test_base64_CFLAGS = -g -I..
-test_base64_LDFLAGS = -L/usr/local/lib -ltap
-test_base64_LDADD = $(top_srcdir)/gl/base64.o 
-
 test: ${noinst_PROGRAMS}
         perl -MTest::Harness -e '$$Test::Harness::switches=""; runtests(map {$$_ .= ".t"} @ARGV)' $(EXTRA_PROGRAMS)