summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl DeBisschop <kdebisschop@users.sourceforge.net>2003-07-11 06:12:24 +0000
committerKarl DeBisschop <kdebisschop@users.sourceforge.net>2003-07-11 06:12:24 +0000
commit29df7b318c942ff4363b425c63020b77f24096c0 (patch)
tree4b1f50b67d9b86add1d32447027644e4b1603379
parent6aaca0f135d87c0593b78d9c9b7c0cff1bec3be9 (diff)
downloadmonitoring-plugins-29df7b318c942ff4363b425c63020b77f24096c0.tar.gz
link check_spop and check_simap if ssl libs are compiled into check_tcp
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/branches/release-1.3.0@587 f882894a-f735-0410-b71e-b25c423dba1c
-rw-r--r--configure.in4
-rw-r--r--plugins/Makefile.am3
2 files changed, 5 insertions, 2 deletions
diff --git a/configure.in b/configure.in
index ea01c0e2..dba1d30b 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
1dnl Process this file with autoconf to produce a configure script. 1dnl Process this file with autoconf to produce a configure script.
2AC_REVISION ($Revision$) 2AC_REVISION ($Revision$)
3AC_INIT(Helper.pm) 3AC_INIT(Helper.pm)
4VER=1.3.0 4VER=1.3.1
5REL=1 5REL=1
6AC_SUBST(VER) 6AC_SUBST(VER)
7AC_SUBST(REL) 7AC_SUBST(REL)
@@ -278,6 +278,8 @@ dnl test headers and libs to decide whether check_http should use SSL
278if test "$ac_cv_lib_crypto_CRYPTO_lock" = "yes"; then 278if test "$ac_cv_lib_crypto_CRYPTO_lock" = "yes"; then
279 if test "$ac_cv_lib_ssl_main" = "yes"; then 279 if test "$ac_cv_lib_ssl_main" = "yes"; then
280 if test "$FOUNDINCLUDE" = "yes"; then 280 if test "$FOUNDINCLUDE" = "yes"; then
281 check_tcp_ssl="check_simap check_spop"
282 AC_SUBST(check_tcp_ssl)
281 AC_SUBST(SSLLIBS) 283 AC_SUBST(SSLLIBS)
282 AC_DEFINE(HAVE_SSL,1,[Define if SSL libraries are found]) 284 AC_DEFINE(HAVE_SSL,1,[Define if SSL libraries are found])
283 fi 285 fi
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 4cf44c6c..2561954f 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -14,7 +14,8 @@ EXTRA_PROGRAMS = check_mysql check_radius check_pgsql check_snmp check_hpjd \
14 check_swap check_fping check_ldap check_game check_dig \ 14 check_swap check_fping check_ldap check_game check_dig \
15 check_nagios check_by_ssh check_dns check_nt 15 check_nagios check_by_ssh check_dns check_nt
16 16
17check_tcp_programs = check_ftp check_imap check_nntp check_pop 17check_tcp_programs = check_ftp check_imap check_nntp check_pop \
18 @check_tcp_ssl@
18 19
19EXTRA_DIST = t utils.c netutils.c popen.c \ 20EXTRA_DIST = t utils.c netutils.c popen.c \
20 snprintf.c 21 snprintf.c