diff options
author | Karl DeBisschop <kdebisschop@users.sourceforge.net> | 2003-07-11 06:12:24 +0000 |
---|---|---|
committer | Karl DeBisschop <kdebisschop@users.sourceforge.net> | 2003-07-11 06:12:24 +0000 |
commit | 29df7b318c942ff4363b425c63020b77f24096c0 (patch) | |
tree | 4b1f50b67d9b86add1d32447027644e4b1603379 | |
parent | 6aaca0f135d87c0593b78d9c9b7c0cff1bec3be9 (diff) | |
download | monitoring-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.in | 4 | ||||
-rw-r--r-- | plugins/Makefile.am | 3 |
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 @@ | |||
1 | dnl Process this file with autoconf to produce a configure script. | 1 | dnl Process this file with autoconf to produce a configure script. |
2 | AC_REVISION ($Revision$) | 2 | AC_REVISION ($Revision$) |
3 | AC_INIT(Helper.pm) | 3 | AC_INIT(Helper.pm) |
4 | VER=1.3.0 | 4 | VER=1.3.1 |
5 | REL=1 | 5 | REL=1 |
6 | AC_SUBST(VER) | 6 | AC_SUBST(VER) |
7 | AC_SUBST(REL) | 7 | AC_SUBST(REL) |
@@ -278,6 +278,8 @@ dnl test headers and libs to decide whether check_http should use SSL | |||
278 | if test "$ac_cv_lib_crypto_CRYPTO_lock" = "yes"; then | 278 | if 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 | ||
17 | check_tcp_programs = check_ftp check_imap check_nntp check_pop | 17 | check_tcp_programs = check_ftp check_imap check_nntp check_pop \ |
18 | @check_tcp_ssl@ | ||
18 | 19 | ||
19 | EXTRA_DIST = t utils.c netutils.c popen.c \ | 20 | EXTRA_DIST = t utils.c netutils.c popen.c \ |
20 | snprintf.c | 21 | snprintf.c |