summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTon Voon <tonvoon@users.sourceforge.net>2004-12-08 00:22:01 +0000
committerTon Voon <tonvoon@users.sourceforge.net>2004-12-08 00:22:01 +0000
commit911af3e7acb18caf051003b365a319173abfd989 (patch)
treeb0764adbeea225b11a304b9e7bf6723b0bf64b68
parent7d25147c1e1cadd11b6ffba18c6d6ba4bb334a7b (diff)
downloadmonitoring-plugins-911af3e7acb18caf051003b365a319173abfd989.tar.gz
Fixed output info for openssl and LD_LIBRARY_PATH for subsequent compiles
(otherwise get ld.so.1: ./conftest: fatal: libssl.so.0.9.7: open failed) git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1012 f882894a-f735-0410-b71e-b25c423dba1c
-rw-r--r--configure.in9
1 files changed, 7 insertions, 2 deletions
diff --git a/configure.in b/configure.in
index 33f3e599..36f86051 100644
--- a/configure.in
+++ b/configure.in
@@ -264,6 +264,7 @@ OPT_OPENSSL=$withval)
264 264
265if test X"$OPT_OPENSSL" = "Xno"; then 265if test X"$OPT_OPENSSL" = "Xno"; then
266 AC_MSG_WARN([openssl disabled, you will not be able to use ssl options in some plugins]) 266 AC_MSG_WARN([openssl disabled, you will not be able to use ssl options in some plugins])
267 with_openssl=no
267else 268else
268 dnl backup the pre-ssl variables 269 dnl backup the pre-ssl variables
269 CLEANLDFLAGS="$LDFLAGS" 270 CLEANLDFLAGS="$LDFLAGS"
@@ -383,14 +384,18 @@ else
383 384
384 fi 385 fi
385 386
386 if test X"$OPT_OPENSSL" != Xoff && 387 if test X"$OPT_OPENSSL" != "Xno" &&
387 test "$OPENSSL_ENABLED" != "1"; then 388 test "$OPENSSL_ENABLED" != "1"; then
388 AC_MSG_ERROR([OpenSSL libs and/or directories were not found where specified!]) 389 AC_MSG_WARN([OpenSSL libs and/or directories were not found where specified!])
390 with_openssl="no"
389 elif test "$OPENSSL_ENABLED" = "1"; then 391 elif test "$OPENSSL_ENABLED" = "1"; then
390 check_tcp_ssl="check_simap check_spop check_jabber check_nntps" 392 check_tcp_ssl="check_simap check_spop check_jabber check_nntps"
391 AC_SUBST(check_tcp_ssl) 393 AC_SUBST(check_tcp_ssl)
392 AC_DEFINE(HAVE_SSL,1,[Define if SSL libraries are found]) 394 AC_DEFINE(HAVE_SSL,1,[Define if SSL libraries are found])
393 with_openssl="yes" 395 with_openssl="yes"
396
397 # Needed for subsequent compiled programs
398 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$OPENSSL/lib"
394 fi 399 fi
395fi 400fi
396 401