[icinga-checkins] icinga.org: icinga-core/mfriedrich/core: Revert " Better solution for 40b98f218bcda9eb3f5ca1ecc772f5b6e23e4b3c for sslbin"

git at icinga.org git at icinga.org
Mon Sep 27 10:34:54 CEST 2010


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

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Sep 27 10:23:19 2010 +0200

Revert "Better solution for 40b98f218bcda9eb3f5ca1ecc772f5b6e23e4b3c for sslbin"

This reverts commit d5fa1ebcfba27f97b8b6f4f91f95e1c226c0417e.

---

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

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





More information about the icinga-checkins mailing list