[Nagiosplug-checkins] SF.net SVN: nagiosplug:[2068] nagiosplug/trunk

[tonvoon at users.sourceforge.net]

Revision: 2068
          http://nagiosplug.svn.sourceforge.net/nagiosplug/?rev=2068&view=rev
Author:   tonvoon
Date:     2008-11-05 12:19:44 +0000 (Wed, 05 Nov 2008)

Log Message:
-----------
Fixed libtap dependency issue. Warning: will install tap into lib directories
if ./configure --enable-libtap is used, but as development tool, will be okay

Modified Paths:
--------------
    nagiosplug/trunk/Makefile.am
    nagiosplug/trunk/NEWS
    nagiosplug/trunk/configure.in

Modified: nagiosplug/trunk/Makefile.am
===================================================================
--- nagiosplug/trunk/Makefile.am	2008-11-05 00:14:37 UTC (rev 2067)
+++ nagiosplug/trunk/Makefile.am	2008-11-05 12:19:44 UTC (rev 2068)
@@ -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 \

Modified: nagiosplug/trunk/NEWS
===================================================================
--- nagiosplug/trunk/NEWS	2008-11-05 00:14:37 UTC (rev 2067)
+++ nagiosplug/trunk/NEWS	2008-11-05 12:19:44 UTC (rev 2068)
@@ -8,6 +8,7 @@
 	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)

Modified: nagiosplug/trunk/configure.in
===================================================================
--- nagiosplug/trunk/configure.in	2008-11-05 00:14:37 UTC (rev 2067)
+++ nagiosplug/trunk/configure.in	2008-11-05 12:19:44 UTC (rev 2068)
@@ -166,6 +166,10 @@
 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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.