[icinga-checkins] icinga.org: icinga-core/mbecker/test: Better solution for 40b98f218bcda9eb3f5ca1ecc772f5b6e23e4b3c for sslbin

[git at icinga.org]

Module: icinga-core
Branch: mbecker/test
Commit: d5fa1ebcfba27f97b8b6f4f91f95e1c226c0417e
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=d5fa1ebcfba27f97b8b6f4f91f95e1c226c0417e

Author: Mike Becker <mike.becker at redpeppersworld.de>
Date:   Fri Sep 24 20:15:02 2010 +0200

Better solution for 40b98f218bcda9eb3f5ca1ecc772f5b6e23e4b3c for sslbin

---

 configure    |   12 +++++++-----
 configure.in |   12 +++++++-----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/configure b/configure
index 059def6..2b58beb 100755
--- a/configure
+++ b/configure
@@ -6723,11 +6723,13 @@ _ACEOF
 
 						echo ""
 			echo "*** Generating DH Parameters for SSL/TLS ***"
-			if test -f "$ssldir/sbin/openssl"; then
-				sslbin=$ssldir/sbin/openssl
-			else
-				sslbin=$ssldir/bin/openssl
-			fi
+			# Not really useful sometimes better to use the bin that in the PATH
+			#if test -f "$ssldir/sbin/openssl"; then
+			#	sslbin=$ssldir/sbin/openssl
+			#else
+			#	sslbin=$ssldir/bin/openssl
+			#fi
+			sslbin=`which openssl`
 			# awk to strip off meta data at bottom of dhparam output
 			$sslbin dhparam -C 512 | awk '/^-----/ {exit} {print}' > include/dh.h
 		fi
diff --git a/configure.in b/configure.in
index 0a1e828..fa1717a 100644
--- a/configure.in
+++ b/configure.in
@@ -1063,11 +1063,13 @@ if test x$check_for_ssl = xyes; then
 			dnl Generate DH parameters
 			echo ""
 			echo "*** Generating DH Parameters for SSL/TLS ***"
-			if test -f "$ssldir/sbin/openssl"; then
-				sslbin=$ssldir/sbin/openssl
-			else
-				sslbin=$ssldir/bin/openssl
-			fi
+			# Not really useful sometimes better to use the bin that in the PATH
+			#if test -f "$ssldir/sbin/openssl"; then
+			#	sslbin=$ssldir/sbin/openssl
+			#else
+			#	sslbin=$ssldir/bin/openssl
+			#fi
+			sslbin=`which openssl`
 			# awk to strip off meta data at bottom of dhparam output
 			$sslbin dhparam -C 512 | awk '/^-----/ {exit} {print}' > include/dh.h
 		fi