summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.in19
-rw-r--r--plugins/tests/Makefile.am2
2 files changed, 9 insertions, 12 deletions
diff --git a/configure.in b/configure.in
index 16e22a6..ddbde15 100644
--- a/configure.in
+++ b/configure.in
@@ -74,17 +74,6 @@ AC_SUBST(with_nagios_group)
74INSTALL_OPTS="-o $with_nagios_user -g $with_nagios_group" 74INSTALL_OPTS="-o $with_nagios_user -g $with_nagios_group"
75AC_SUBST(INSTALL_OPTS) 75AC_SUBST(INSTALL_OPTS)
76 76
77AC_ARG_WITH(libtap-srcdir,
78 ACX_HELP_STRING([--with-libtap-srcdir=path],
79 [full path to a compiled libtap srcdir]),
80 EXTRA_TEST=test_utils
81 EXTRA_TAPOBJ=$withval/tap.o
82 AC_SUBST(EXTRA_TEST)
83 AC_SUBST(EXTRA_TAPOBJ)
84 LDFLAGS="$LDFLAGS -L$withval"
85 CPPFLAGS="$CPPFLAGS -I$withval"
86 )
87
88AC_ARG_WITH(trusted_path, 77AC_ARG_WITH(trusted_path,
89 ACX_HELP_STRING([--with-trusted-path=PATH], 78 ACX_HELP_STRING([--with-trusted-path=PATH],
90 [sets trusted path for executables called by scripts (default=/bin:/sbin:/usr/bin:/usr/sbin)]), 79 [sets trusted path for executables called by scripts (default=/bin:/sbin:/usr/bin:/usr/sbin)]),
@@ -177,6 +166,14 @@ AC_CHECK_HEADERS(math.h)
177AC_CHECK_LIB(m,floor,MATHLIBS="-lm") 166AC_CHECK_LIB(m,floor,MATHLIBS="-lm")
178AC_SUBST(MATHLIBS) 167AC_SUBST(MATHLIBS)
179 168
169dnl Check for libtap, to run perl-like tests
170AC_CHECK_LIB(tap, plan_tests,
171 TAPLIBS="-ltap"
172 EXTRA_TEST=test_utils
173 AC_SUBST(EXTRA_TEST)
174 AC_SUBST(TAPLIBS)
175 )
176
180dnl Check for PostgreSQL libraries 177dnl Check for PostgreSQL libraries
181_SAVEDLIBS="$LIBS" 178_SAVEDLIBS="$LIBS"
182_SAVEDCPPFLAGS="$CPPFLAGS" 179_SAVEDCPPFLAGS="$CPPFLAGS"
diff --git a/plugins/tests/Makefile.am b/plugins/tests/Makefile.am
index cd4caeb..c73725d 100644
--- a/plugins/tests/Makefile.am
+++ b/plugins/tests/Makefile.am
@@ -16,7 +16,7 @@ LIBS = @LIBINTL@
16test_utils_SOURCES = test_utils.c 16test_utils_SOURCES = test_utils.c
17test_utils_CFLAGS = -g -I.. 17test_utils_CFLAGS = -g -I..
18test_utils_LDFLAGS = -L.. 18test_utils_LDFLAGS = -L..
19test_utils_LDADD = ../utils.o @EXTRA_TAPOBJ@ 19test_utils_LDADD = ../utils.o $(TAPLIBS)
20 20
21test: ${noinst_PROGRAMS} 21test: ${noinst_PROGRAMS}
22 perl -MTest::Harness -e '$$Test::Harness::switches=""; runtests(map {$$_ .= ".t"} @ARGV)' $(EXTRA_PROGRAMS) 22 perl -MTest::Harness -e '$$Test::Harness::switches=""; runtests(map {$$_ .= ".t"} @ARGV)' $(EXTRA_PROGRAMS)