summaryrefslogtreecommitdiffstats
path: root/configure.in
diff options
context:
space:
mode:
authorTon Voon <tonvoon@users.sourceforge.net>2005-01-14 10:59:49 (GMT)
committerTon Voon <tonvoon@users.sourceforge.net>2005-01-14 10:59:49 (GMT)
commit3c74ee08ebb2d5332335f47e6ea6652a7e5e84a7 (patch)
treec83bc6e68a8680e892281b68aaa57fcd4904fb22 /configure.in
parentd866b45fdd8c41c7ff22f3aca35ce4b41f8e16a2 (diff)
downloadmonitoring-plugins-3c74ee08ebb2d5332335f47e6ea6652a7e5e84a7.tar.gz
Fixed ssl configure problems on Solaris (Bug 1096091)
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1081 f882894a-f735-0410-b71e-b25c423dba1c
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in14
1 files changed, 9 insertions, 5 deletions
diff --git a/configure.in b/configure.in
index 030b1de..d6ea4d3 100644
--- a/configure.in
+++ b/configure.in
@@ -419,15 +419,17 @@ AC_HELP_STRING([--with-openssl=DIR], [sets path to openssl installation])
419AC_HELP_STRING([--without-openssl], [disable openssl]), 419AC_HELP_STRING([--without-openssl], [disable openssl]),
420OPENSSL=$withval) 420OPENSSL=$withval)
421 421
422_SAVEDCPPFLAGS="$CPPFLAGS"
423_SAVEDLDFLAGS="$LDFLAGS"
422if test X"$OPENSSL" = "Xno"; then 424if test X"$OPENSSL" = "Xno"; then
423 AC_MSG_WARN([openssl disabled, you will not be able to use ssl options in some plugins]) 425 AC_MSG_WARN([openssl disabled, you will not be able to use ssl options in some plugins])
424 FOUNDSSL="dontbother" 426 FOUNDSSL="dontbother"
425else 427else
426 dnl Check for OpenSSL header files 428 dnl Check for OpenSSL header files
427 unset FOUNDINCLUDE 429 unset FOUNDINCLUDE
428 _SAVEDCPPFLAGS="$CPPFLAGS"
429 if test "$OPENSSL" != "/usr"; then 430 if test "$OPENSSL" != "/usr"; then
430 CPPFLAGS="$CPPFLAGS -I$OPENSSL/include" 431 CPPFLAGS="$CPPFLAGS -I$OPENSSL/include"
432 LDFLAGS="$LDFLAGS -R$OPENSSL/lib"
431 fi 433 fi
432 AC_CHECK_HEADERS(openssl/ssl.h openssl/x509.h openssl/rsa.h openssl/pem.h openssl/crypto.h openssl/err.h, 434 AC_CHECK_HEADERS(openssl/ssl.h openssl/x509.h openssl/rsa.h openssl/pem.h openssl/crypto.h openssl/err.h,
433 SSLINCLUDE="-I$OPENSSL/include" 435 SSLINCLUDE="-I$OPENSSL/include"
@@ -470,13 +472,15 @@ if test "$FOUNDSSL" = "yes"; then
470 AC_SUBST(SSLLIBS) 472 AC_SUBST(SSLLIBS)
471 AC_DEFINE(HAVE_SSL,1,[Define if SSL libraries are found]) 473 AC_DEFINE(HAVE_SSL,1,[Define if SSL libraries are found])
472 with_openssl="yes" 474 with_openssl="yes"
473elif test "$FOUNDSSL" = "no"; then
474 AC_MSG_WARN([OpenSSL libs could not be found])
475 with_openssl="no"
476else 475else
476 if test "$FOUNDSSL" = "no"; then
477 AC_MSG_WARN([OpenSSL libs could not be found])
478 dnl else deliberately disabled
479 fi
477 with_openssl="no" 480 with_openssl="no"
481 CPPFLAGS="$_SAVEDCPPFLAGS"
482 LDFLAGS="$_SAVEDLDFLAGS"
478fi 483fi
479CPPFLAGS="$_SAVEDCPPFLAGS"
480 484
481dnl 485dnl
482dnl Checks for header files. 486dnl Checks for header files.