[Nagiosplug-checkins] nagiosplug configure.in,1.135,1.136

[Ton Voon]

Update of /cvsroot/nagiosplug/nagiosplug
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv634

Modified Files:
	configure.in 
Log Message:
Fixed ssl configure problems on Solaris (Bug 1096091)


Index: configure.in
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/configure.in,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- configure.in	13 Jan 2005 18:24:51 -0000	1.135
+++ configure.in	14 Jan 2005 10:59:49 -0000	1.136
@@ -419,15 +419,17 @@
 AC_HELP_STRING([--without-openssl], [disable openssl]),
 OPENSSL=$withval)
 
+_SAVEDCPPFLAGS="$CPPFLAGS"
+_SAVEDLDFLAGS="$LDFLAGS"
 if test X"$OPENSSL" = "Xno"; then
   AC_MSG_WARN([openssl disabled, you will not be able to use ssl options in some plugins])
   FOUNDSSL="dontbother"
 else
   dnl Check for OpenSSL header files
   unset FOUNDINCLUDE
-  _SAVEDCPPFLAGS="$CPPFLAGS"
   if test "$OPENSSL" != "/usr"; then
     CPPFLAGS="$CPPFLAGS -I$OPENSSL/include"
+    LDFLAGS="$LDFLAGS -R$OPENSSL/lib"
   fi
   AC_CHECK_HEADERS(openssl/ssl.h openssl/x509.h openssl/rsa.h openssl/pem.h openssl/crypto.h openssl/err.h,
                  SSLINCLUDE="-I$OPENSSL/include"
@@ -470,13 +472,15 @@
   AC_SUBST(SSLLIBS)
   AC_DEFINE(HAVE_SSL,1,[Define if SSL libraries are found])
   with_openssl="yes"
-elif test "$FOUNDSSL" = "no"; then
-  AC_MSG_WARN([OpenSSL libs could not be found])
-  with_openssl="no"
 else
+  if test "$FOUNDSSL" = "no"; then
+    AC_MSG_WARN([OpenSSL libs could not be found])
+  dnl else deliberately disabled
+  fi
   with_openssl="no"
+  CPPFLAGS="$_SAVEDCPPFLAGS"
+  LDFLAGS="$_SAVEDLDFLAGS"
 fi
-CPPFLAGS="$_SAVEDCPPFLAGS"
 
 dnl
 dnl Checks for header files.