[icinga-checkins] icinga.org: icinga-core/mfriedrich/solaris: better ssl detection in solaris when /usr/local/ssl used for --with-ssl

git at icinga.org git at icinga.org
Thu Sep 23 18:56:08 CEST 2010


Module: icinga-core
Branch: mfriedrich/solaris
Commit: 40b98f218bcda9eb3f5ca1ecc772f5b6e23e4b3c
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=40b98f218bcda9eb3f5ca1ecc772f5b6e23e4b3c

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Thu Sep 23 18:57:14 2010 +0200

better ssl detection in solaris when /usr/local/ssl used for --with-ssl

---

 Changelog          |    1 +
 configure          |   12 +++++++++++-
 configure.in       |   10 ++++++++++
 include/.gitignore |    1 +
 include/Makefile   |    2 +-
 5 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/Changelog b/Changelog
index c2ab00a..948b27b 100644
--- a/Changelog
+++ b/Changelog
@@ -39,6 +39,7 @@ FIXES
 * idoutils: fix ido2db forking if database connection failed, now immediately disconnecting the client #773
 
 * install: remove php dependency and files for updatechecks/extended search in icinga.spec #800
+* install: better ssl detection in solaris when /usr/local/ssl used for --with-ssl
 
 
 1.0.3 - 18/08/2010
diff --git a/configure b/configure
index 3503d2f..059def6 100755
--- a/configure
+++ b/configure
@@ -768,7 +768,8 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
-CPP'
+CPP
+CPPFLAGS'
 ac_subdirs_all='tap
 module/icinga-api'
 
@@ -6695,6 +6696,11 @@ $as_echo_n "checking for SSL libraries... " >&6; }
 				found_ssl=yes
 			        break
 			fi
+			if test -f "$dir/lib/libssl.so"; then
+				found_ssl=yes
+				ssllibdir="$dir/lib"
+			        break
+			fi
 		done
 
 		if test x_$found_ssl != x_yes; then
@@ -6711,6 +6717,10 @@ _ACEOF
 
 
 
+						if test "ssl_dir" != ""; then
+				ssldir="$ssl_dir"
+			fi
+
 						echo ""
 			echo "*** Generating DH Parameters for SSL/TLS ***"
 			if test -f "$ssldir/sbin/openssl"; then
diff --git a/configure.in b/configure.in
index cd3294a..0a1e828 100644
--- a/configure.in
+++ b/configure.in
@@ -1037,6 +1037,11 @@ if test x$check_for_ssl = xyes; then
 				found_ssl=yes
 			        break
 			fi
+			if test -f "$dir/lib/libssl.so"; then
+				found_ssl=yes
+				ssllibdir="$dir/lib"
+			        break
+			fi
 		done
 
 		if test x_$found_ssl != x_yes; then
@@ -1050,6 +1055,11 @@ if test x$check_for_ssl = xyes; then
 			AC_DEFINE_UNQUOTED(HAVE_SSL)
 			AC_SUBST(HAVE_SSL)
 
+			dnl if ssl dir provided, thake this instead
+			if test "ssl_dir" != ""; then
+				ssldir="$ssl_dir"
+			fi
+
 			dnl Generate DH parameters
 			echo ""
 			echo "*** Generating DH Parameters for SSL/TLS ***"
diff --git a/include/.gitignore b/include/.gitignore
index 0f80662..e8d2ce2 100644
--- a/include/.gitignore
+++ b/include/.gitignore
@@ -1,3 +1,4 @@
 locations.h
 config.h
 snprintf.h
+dh.h
diff --git a/include/Makefile b/include/Makefile
index 8e80ba5..ea1a225 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -6,6 +6,6 @@ clean:
 	rm -f *~
 
 distclean: clean
-	rm -f config.h locations.h snprintf.h
+	rm -f config.h locations.h snprintf.h dh.h
 
 devclean: distclean





More information about the icinga-checkins mailing list