[icinga-checkins] icinga.org: icinga-core/rb_1.2: Fixes configure with SSL on non-solaris systems

git at icinga.org git at icinga.org
Wed Sep 29 15:57:52 CEST 2010


Module: icinga-core
Branch: rb_1.2
Commit: db2fb9e216ce32091a8e1bc86c3ffd5e364357b3
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=db2fb9e216ce32091a8e1bc86c3ffd5e364357b3

Author: Mike Becker <mike.becker at redpeppersworld.de>
Date:   Wed Sep 29 15:37:52 2010 +0200

Fixes configure with SSL on non-solaris systems
fixes #832

---

 configure    |    7 ++++++-
 configure.in |    6 +++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 059def6..30fe2cf 100755
--- a/configure
+++ b/configure
@@ -6726,7 +6726,12 @@ _ACEOF
 			if test -f "$ssldir/sbin/openssl"; then
 				sslbin=$ssldir/sbin/openssl
 			else
-				sslbin=$ssldir/bin/openssl
+				if test -f "$ssldir/bin/openssl"; then
+					sslbin=$ssldir/bin/openssl
+				else
+					sslbin=openssl
+				fi
+
 			fi
 			# awk to strip off meta data at bottom of dhparam output
 			$sslbin dhparam -C 512 | awk '/^-----/ {exit} {print}' > include/dh.h
diff --git a/configure.in b/configure.in
index 0a1e828..49d78b8 100644
--- a/configure.in
+++ b/configure.in
@@ -1066,7 +1066,11 @@ if test x$check_for_ssl = xyes; then
 			if test -f "$ssldir/sbin/openssl"; then
 				sslbin=$ssldir/sbin/openssl
 			else
-				sslbin=$ssldir/bin/openssl
+				if test -f "$ssldir/bin/openssl"; then
+                                        sslbin=$ssldir/bin/openssl
+                                else
+                                        sslbin=openssl
+                                fi
 			fi
 			# awk to strip off meta data at bottom of dhparam output
 			$sslbin dhparam -C 512 | awk '/^-----/ {exit} {print}' > include/dh.h





More information about the icinga-checkins mailing list