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

diff --git a/Makefile.am b/Makefile.am
index 770a79832e781f971ff6a2b70109046640daca1e..0452133ffc3e67625f889d0829e74a3e153336e4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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 \

diff --git a/NEWS b/NEWS
index 42eb761e560e570528e36cd6ba846981862518e7..ecabde32e5e427bae0ec8dd04a3a731db2f989e1 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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)

diff --git a/configure.in b/configure.in
index 17fd14c4f2be18f0f2c22e7500dcf54ae6b5e034..7687ae6ef9715dfa8165054ce45e932257696edd 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -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