diff options
| author |  Ton Voon <tonvoon@users.sourceforge.net>
| 2006-02-24 16:41:06 +0000 |
|---|---|---|
| committer | Ton Voon <tonvoon@users.sourceforge.net>
| 2006-02-24 16:41:06 +0000 |
| commit | 6aa8cc090daa646f6d3d7b5af2ab5e59dd7d9b18 (patch) | |
| tree | c47865be2c6a40a09c029e4aa330bc3864afd463 /configure.in | |
| parent | 4a7401ea71fc7735be5fe371eb155284eb3a9583 (diff) | |
| download | monitoring-plugins-6aa8cc090daa646f6d3d7b5af2ab5e59dd7d9b18.tar.gz | |
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
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/configure.in b/configure.in index 16e22a68..ddbde159 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" |