diff options
| author | Karl DeBisschop <kdebisschop@users.sourceforge.net> | 2003-07-04 10:42:13 +0000 |
|---|---|---|
| committer | Karl DeBisschop <kdebisschop@users.sourceforge.net> | 2003-07-04 10:42:13 +0000 |
| commit | 305ae8615cb533b88c15c9edebf9ed72e783a521 (patch) | |
| tree | a4bd63eb2efaebb1c50b101ecbabe1479e4675f6 | |
| parent | de2773d48510f3ef7908e341446bc2b72c0b7969 (diff) | |
| download | monitoring-plugins-305ae8615cb533b88c15c9edebf9ed72e783a521.tar.gz | |
only make links for check_spop and check_simap when SSL is built into check_tcp
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@586 f882894a-f735-0410-b71e-b25c423dba1c
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | plugins/Makefile.am | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/configure.in b/configure.in index a7833051..b618c777 100644 --- a/configure.in +++ b/configure.in | |||
| @@ -452,6 +452,8 @@ dnl test headers and libs to decide whether check_http should use SSL | |||
| 452 | if test "$ac_cv_lib_crypto_CRYPTO_lock" = "yes"; then | 452 | if test "$ac_cv_lib_crypto_CRYPTO_lock" = "yes"; then |
| 453 | if test "$ac_cv_lib_ssl_main" = "yes"; then | 453 | if test "$ac_cv_lib_ssl_main" = "yes"; then |
| 454 | if test "$FOUNDINCLUDE" = "yes"; then | 454 | if test "$FOUNDINCLUDE" = "yes"; then |
| 455 | check_tcp_ssl="check_simap check_spop" | ||
| 456 | AC_SUBST(check_tcp_ssl) | ||
| 455 | AC_SUBST(SSLLIBS) | 457 | AC_SUBST(SSLLIBS) |
| 456 | AC_DEFINE(HAVE_SSL,1,[Define if SSL libraries are found]) | 458 | AC_DEFINE(HAVE_SSL,1,[Define if SSL libraries are found]) |
| 457 | fi | 459 | fi |
diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 022cff88..6d817b1e 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am | |||
| @@ -10,13 +10,13 @@ libexec_PROGRAMS = check_disk check_dummy check_http check_load \ | |||
| 10 | check_udp check_ups check_users negate urlize \ | 10 | check_udp check_ups check_users negate urlize \ |
| 11 | @EXTRAS@ | 11 | @EXTRAS@ |
| 12 | 12 | ||
| 13 | check_tcp_programs = check_ftp check_imap check_nntp check_pop check_udp2 \ | ||
| 14 | @check_tcp_ssl@ | ||
| 15 | |||
| 13 | EXTRA_PROGRAMS = check_mysql check_radius check_pgsql check_snmp check_hpjd \ | 16 | EXTRA_PROGRAMS = check_mysql check_radius check_pgsql check_snmp check_hpjd \ |
| 14 | check_swap check_fping check_ldap check_game check_dig \ | 17 | check_swap check_fping check_ldap check_game check_dig \ |
| 15 | check_nagios check_by_ssh check_dns check_nt | 18 | check_nagios check_by_ssh check_dns check_nt |
| 16 | 19 | ||
| 17 | check_tcp_programs = check_ftp check_imap check_nntp check_pop check_udp2 | ||
| 18 | check_tcp_programs += check_simap check_spop | ||
| 19 | |||
| 20 | EXTRA_DIST = t utils.c netutils.c popen.c utils.h netutils.h popen.h common.h \ | 20 | EXTRA_DIST = t utils.c netutils.c popen.c utils.h netutils.h popen.h common.h \ |
| 21 | getaddrinfo.c getaddrinfo.h gethostbyname.c gethostbyname.h | 21 | getaddrinfo.c getaddrinfo.h gethostbyname.c gethostbyname.h |
| 22 | 22 | ||
