summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTon Voon <tonvoon@users.sourceforge.net>2008-11-05 12:19:44 (GMT)
committerTon Voon <tonvoon@users.sourceforge.net>2008-11-05 12:19:44 (GMT)
commitf3e0909e124674db029dbfbfb4ae80de94a5d89f (patch)
tree8de10383f3436e42930291a950f8220f16c227c9
parent8f24f0bfdfb1eb2d1c5f59febc2498f03fd8ad78 (diff)
downloadmonitoring-plugins-f3e0909e124674db029dbfbfb4ae80de94a5d89f.tar.gz
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
-rw-r--r--Makefile.am2
-rw-r--r--NEWS1
-rw-r--r--configure.in4
3 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 770a798..0452133 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
1## Process this file with automake to produce Makefile.in 1## Process this file with automake to produce Makefile.in
2 2
3SUBDIRS = gl lib plugins plugins-scripts plugins-root po @PERLMODS_DIR@ 3SUBDIRS = gl @INCLUDE_TAP_DIR@ lib plugins plugins-scripts plugins-root po @PERLMODS_DIR@
4 4
5# Have to list TAP_DIR manually to get in distribution 5# Have to list TAP_DIR manually to get in distribution
6EXTRA_DIST = config.rpath \ 6EXTRA_DIST = config.rpath \
diff --git a/NEWS b/NEWS
index 42eb761..ecabde3 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ This file documents the major additions and syntax changes between releases.
8 check_ups now sends a LOGOUT string (debian bug #387001) 8 check_ups now sends a LOGOUT string (debian bug #387001)
9 Extra-opts (C plugins) now allows both '#' and ';' for comments (like N::P) 9 Extra-opts (C plugins) now allows both '#' and ';' for comments (like N::P)
10 Extra-opts (C plugins) does not allow trailing comments anymore (like N::P) 10 Extra-opts (C plugins) does not allow trailing comments anymore (like N::P)
11 Fixed dependency issue on libtap when ./configure --enable-libtap used. Warning: will install libtap
11 12
121.4.13 25th Sept 2008 131.4.13 25th Sept 2008
13 Fix Debian bug #460097: check_http --max-age broken (Hilko Bengen) 14 Fix Debian bug #460097: check_http --max-age broken (Hilko Bengen)
diff --git a/configure.in b/configure.in
index 17fd14c..7687ae6 100644
--- a/configure.in
+++ b/configure.in
@@ -166,6 +166,10 @@ AC_SUBST(TAP_DIR)
166if test "$enable_libtap" = yes; then 166if test "$enable_libtap" = yes; then
167 dnl Have to have AC_CONFIG_SUBDIRS as a literal 167 dnl Have to have AC_CONFIG_SUBDIRS as a literal
168 AC_CONFIG_SUBDIRS([external/tap-1.01]) 168 AC_CONFIG_SUBDIRS([external/tap-1.01])
169 dnl This is required so that TAP stuff is compiled before the libs and tests
170 dnl A make install will also install the tap library, but as this is a development tool, this should be okay
171 INCLUDE_TAP_DIR=$TAP_DIR
172 AC_SUBST(INCLUDE_TAP_DIR)
169 EXTRA_TEST="test_utils test_disk test_tcp test_cmd test_base64" 173 EXTRA_TEST="test_utils test_disk test_tcp test_cmd test_base64"
170 AC_SUBST(EXTRA_TEST) 174 AC_SUBST(EXTRA_TEST)
171fi 175fi