[opensaml2] 22/38: CPPOST-93 - Source build fails to link properly against OpenSSL

[Ferenc Wágner]

This is an automated email from the git hooks/post-receive script.

wferi pushed a commit to branch master
in repository opensaml2.

commit a88ee5939824ba8eb2982d0bbae6c73626a30649
Author: Scott Cantor <cantor.2 at osu.edu>
Date:   Thu Jun 2 15:49:48 2016 -0400

    CPPOST-93 - Source build fails to link properly against OpenSSL
    
    https://issues.shibboleth.net/jira/browse/CPPOST-93
---
 configure.ac | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index b09de69..0de178e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -115,12 +115,16 @@ AC_ARG_WITH(openssl,
     AS_HELP_STRING([--with-openssl=PATH],[where openssl is installed]),
     [if test x_$with_openssl != x_/usr; then
         SSLFLAGS="-I${with_openssl}/include"
+        SSLLIBS="-L${with_openssl}/lib -lcrypto -lssl"
+    else
+        SSLLIBS="-lcrypto -lssl"
     fi])
 
 if test "x$with_openssl" = "x" ; then
     AC_PATH_PROG(PKG_CONFIG, pkg-config)
     if test "x$PKG_CONFIG" != x && test "x$PKG_CONFIG" != "xno" ; then
         if pkg-config openssl ; then
+            SSLLIBS="`$PKG_CONFIG --libs openssl`"
             SSLFLAGS="`$PKG_CONFIG --cflags openssl`"
         else
             AC_MSG_WARN([OpenSSL not supported by pkg-config, try --with-openssl instead])
@@ -128,9 +132,16 @@ if test "x$with_openssl" = "x" ; then
     fi
 fi
 
+if test "x$SSLLIBS" = "x" ; then
+    SSLLIBS="-lcrypto -lssl"
+fi
+
 AC_MSG_CHECKING(for OpenSSL cflags)
 AC_MSG_RESULT($SSLFLAGS)
 CPPFLAGS="$SSLFLAGS $CPPFLAGS"
+AC_MSG_CHECKING(for OpenSSL libraries)
+AC_MSG_RESULT($SSLLIBS)
+LIBS="$LIBS $SSLLIBS"
 
 AC_CHECK_HEADER([openssl/x509.h],,AC_MSG_ERROR([unable to find openssl header files]))
 
@@ -253,10 +264,10 @@ int i = 0;
 #endif])],
     [AC_MSG_RESULT(OK)],
     [AC_MSG_FAILURE([XML-Security version 1.4.0 or greater is required.])])
-    AC_LINK_IFELSE(
-        [AC_LANG_PROGRAM([[#include <xsec/utils/XSECPlatformUtils.hpp>]],
-            [[XSECPlatformUtils::Initialise()]])],,
-        [AC_MSG_ERROR([unable to link with XML-Security])])
+AC_LINK_IFELSE(
+    [AC_LANG_PROGRAM([[#include <xsec/utils/XSECPlatformUtils.hpp>]],
+        [[XSECPlatformUtils::Initialise()]])],,
+    [AC_MSG_ERROR([unable to link with XML-Security])])
 
 # XML-Tooling settings
 AC_ARG_WITH(xmltooling,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/opensaml2.git