瀏覽代碼

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
Karl DeBisschop 22 年之前
父節點
當前提交
305ae8615c
共有 2 個文件被更改,包括 5 次插入3 次删除
  1. 2 0
      configure.in
  2. 3 3
      plugins/Makefile.am

+ 2 - 0
configure.in

@@ -452,6 +452,8 @@ dnl test headers and libs to decide whether check_http should use SSL
 if test "$ac_cv_lib_crypto_CRYPTO_lock" = "yes"; then
   if test "$ac_cv_lib_ssl_main" = "yes"; then
     if test "$FOUNDINCLUDE" = "yes"; then
+      check_tcp_ssl="check_simap check_spop"
+      AC_SUBST(check_tcp_ssl)
       AC_SUBST(SSLLIBS)
       AC_DEFINE(HAVE_SSL,1,[Define if SSL libraries are found])
     fi

+ 3 - 3
plugins/Makefile.am

@@ -10,13 +10,13 @@ libexec_PROGRAMS = check_disk check_dummy check_http check_load \
 	check_udp check_ups check_users negate urlize \
 	@EXTRAS@
 
+check_tcp_programs = check_ftp check_imap check_nntp check_pop check_udp2 \
+	@check_tcp_ssl@
+
 EXTRA_PROGRAMS = check_mysql check_radius check_pgsql check_snmp check_hpjd \
 	check_swap check_fping check_ldap check_game check_dig \
 	check_nagios check_by_ssh check_dns check_nt
 
-check_tcp_programs = check_ftp check_imap check_nntp check_pop check_udp2
-check_tcp_programs += check_simap check_spop
-
 EXTRA_DIST = t utils.c netutils.c popen.c utils.h netutils.h popen.h common.h \
 	getaddrinfo.c getaddrinfo.h gethostbyname.c gethostbyname.h