From 6aa8cc090daa646f6d3d7b5af2ab5e59dd7d9b18 Mon Sep 17 00:00:00 2001
From: Ton Voon <tonvoon@users.sourceforge.net>
Date: Fri, 24 Feb 2006 16:41:06 +0000
Subject: Use the installed tap library instead of requesting a compiled object

git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1318 f882894a-f735-0410-b71e-b25c423dba1c

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)
 INSTALL_OPTS="-o $with_nagios_user -g $with_nagios_group"
 AC_SUBST(INSTALL_OPTS)
 
-AC_ARG_WITH(libtap-srcdir,
-	ACX_HELP_STRING([--with-libtap-srcdir=path],
-		[full path to a compiled libtap srcdir]),
-	EXTRA_TEST=test_utils
-	EXTRA_TAPOBJ=$withval/tap.o
-	AC_SUBST(EXTRA_TEST)
-	AC_SUBST(EXTRA_TAPOBJ)
-	LDFLAGS="$LDFLAGS -L$withval"
-	CPPFLAGS="$CPPFLAGS -I$withval"
-	)
-
 AC_ARG_WITH(trusted_path,
 	ACX_HELP_STRING([--with-trusted-path=PATH],
 		[sets trusted path for executables called by scripts (default=/bin:/sbin:/usr/bin:/usr/sbin)]),
@@ -177,6 +166,14 @@ AC_CHECK_HEADERS(math.h)
 AC_CHECK_LIB(m,floor,MATHLIBS="-lm")
 AC_SUBST(MATHLIBS)
 
+dnl Check for libtap, to run perl-like tests
+AC_CHECK_LIB(tap, plan_tests, 
+	TAPLIBS="-ltap"
+	EXTRA_TEST=test_utils
+	AC_SUBST(EXTRA_TEST)
+	AC_SUBST(TAPLIBS)
+	)
+
 dnl Check for PostgreSQL libraries
 _SAVEDLIBS="$LIBS"
 _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@
 test_utils_SOURCES = test_utils.c
 test_utils_CFLAGS = -g -I..
 test_utils_LDFLAGS = -L..
-test_utils_LDADD = ../utils.o @EXTRA_TAPOBJ@
+test_utils_LDADD = ../utils.o $(TAPLIBS)
 
 test: ${noinst_PROGRAMS}
 	perl -MTest::Harness -e '$$Test::Harness::switches=""; runtests(map {$$_ .= ".t"} @ARGV)' $(EXTRA_PROGRAMS)
-- 
cgit v0.10-9-g596f