[icinga-checkins] icinga.org: icinga-core/mfriedrich/ido: install: fix broken configure ssl detection for idoutils on ubuntu/debian ( Oliver Skibbe) refs #3413

git at icinga.org git at icinga.org
Wed Nov 28 15:47:19 CET 2012


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

Author: Michael Friedrich <michael.friedrich at gmail.com>
Date:   Fri Nov  9 18:41:39 2012 +0100

install: fix broken configure ssl detection for idoutils on ubuntu/debian (Oliver Skibbe) refs #3413

---

 Changelog    |    1 +
 configure    |    2 +-
 configure.in |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Changelog b/Changelog
index cf8015e..caf9f8e 100644
--- a/Changelog
+++ b/Changelog
@@ -27,6 +27,7 @@ FIXES
 * idoutils: fix ido2db does not cleanly exit the client on wrong schema version check in db_hello #3419 - MF
 
 * install: drop unused daemon-init-readhat script (spec uses daemon-init) #3402 - MF
+* install: fix broken configure ssl detection for idoutils on ubuntu/debian (Oliver Skibbe) #3413 - MF
 
 CHANGES
 
diff --git a/configure b/configure
index e647074..e8298e4 100755
--- a/configure
+++ b/configure
@@ -7055,7 +7055,7 @@ $as_echo_n "checking for SSL headers... " >&6; }
 				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL libraries" >&5
 $as_echo_n "checking for SSL libraries... " >&6; }
 		found_ssl=no
-		for dir in $ssl_lib_dir $ssl_dir /usr/lib64 /usr/lib /usr/local/lib /usr/lib/ssl /usr/ssl/lib /usr/openssl/lib /usr/pkg/lib  /usr/freeware/lib/openssl; do
+		for dir in $ssl_lib_dir $ssl_dir /usr/lib/*-linux-gnu /usr/lib64 /usr/lib /usr/local/lib /usr/lib/ssl /usr/ssl/lib /usr/openssl/lib /usr/pkg/lib  /usr/freeware/lib/openssl; do
 			ssllibdir="$dir"
 			if test -f "$dir/libssl.so"; then
 				found_ssl=yes
diff --git a/configure.in b/configure.in
index 770ff06..db95afc 100644
--- a/configure.in
+++ b/configure.in
@@ -1218,7 +1218,7 @@ if test x$check_for_ssl = xyes; then
 		dnl Now try and find SSL libraries
 		AC_MSG_CHECKING(for SSL libraries)
 		found_ssl=no
-		for dir in $ssl_lib_dir $ssl_dir /usr/lib64 /usr/lib /usr/local/lib /usr/lib/ssl /usr/ssl/lib /usr/openssl/lib /usr/pkg/lib  /usr/freeware/lib/openssl; do
+		for dir in $ssl_lib_dir $ssl_dir /usr/lib/*-linux-gnu /usr/lib64 /usr/lib /usr/local/lib /usr/lib/ssl /usr/ssl/lib /usr/openssl/lib /usr/pkg/lib  /usr/freeware/lib/openssl; do
 			ssllibdir="$dir"
 			if test -f "$dir/libssl.so"; then
 				found_ssl=yes





More information about the icinga-checkins mailing list