Fixed libtap dependency issue. Warning: will install tap into lib directories

if ./configure --enable-libtap is used, but as development tool, will be okay


git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2068 f882894a-f735-0410-b71e-b25c423dba1c
This commit is contained in:
Ton Voon 2008-11-05 12:19:44 +00:00
parent 8f24f0bfdf
commit f3e0909e12
3 changed files with 6 additions and 1 deletions

View file

@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
SUBDIRS = gl lib plugins plugins-scripts plugins-root po @PERLMODS_DIR@
SUBDIRS = gl @INCLUDE_TAP_DIR@ lib plugins plugins-scripts plugins-root po @PERLMODS_DIR@
# Have to list TAP_DIR manually to get in distribution
EXTRA_DIST = config.rpath \

1
NEWS
View file

@ -8,6 +8,7 @@ This file documents the major additions and syntax changes between releases.
check_ups now sends a LOGOUT string (debian bug #387001)
Extra-opts (C plugins) now allows both '#' and ';' for comments (like N::P)
Extra-opts (C plugins) does not allow trailing comments anymore (like N::P)
Fixed dependency issue on libtap when ./configure --enable-libtap used. Warning: will install libtap
1.4.13 25th Sept 2008
Fix Debian bug #460097: check_http --max-age broken (Hilko Bengen)

View file

@ -166,6 +166,10 @@ AC_SUBST(TAP_DIR)
if test "$enable_libtap" = yes; then
dnl Have to have AC_CONFIG_SUBDIRS as a literal
AC_CONFIG_SUBDIRS([external/tap-1.01])
dnl This is required so that TAP stuff is compiled before the libs and tests
dnl A make install will also install the tap library, but as this is a development tool, this should be okay
INCLUDE_TAP_DIR=$TAP_DIR
AC_SUBST(INCLUDE_TAP_DIR)
EXTRA_TEST="test_utils test_disk test_tcp test_cmd test_base64"
AC_SUBST(EXTRA_TEST)
fi