[Nagiosplug-checkins] nagiosplug configure.in,1.170,1.171
Ton Voon
tonvoon at users.sourceforge.net
Fri Feb 24 08:42:02 CET 2006
Update of /cvsroot/nagiosplug/nagiosplug
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31225
Modified Files:
configure.in
Log Message:
Use the installed tap library instead of requesting a compiled object
Index: configure.in
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/configure.in,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -d -r1.170 -r1.171
--- configure.in 31 Jan 2006 16:45:29 -0000 1.170
+++ configure.in 24 Feb 2006 16:41:06 -0000 1.171
@@ -74,17 +74,6 @@
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_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"
More information about the Commits
mailing list