Handle openssl when pkg_config not supported.

[shibboleth/sp.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 62df0f9..91ed822 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -92,7 +92,7 @@ AC_ARG_WITH(openssl,
         SSLFLAGS="-I${with_openssl}/include"
     fi])
 
-if test "x$SSLFLAGS" = "x" ; then
+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
@@ -157,7 +157,7 @@ AC_ARG_WITH(log4shib,
     fi
     ])
 if test -f "${LOG4SHIB_CONFIG}"; then
-    LDFLAGS="`${LOG4SHIB_CONFIG} --libs` $LDFLAGS"
+    LIBS="`${LOG4SHIB_CONFIG} --libs` $LIBS"
     CPPFLAGS="`${LOG4SHIB_CONFIG} --cflags` $CPPFLAGS"
        AC_CHECK_HEADER([log4shib/CategoryStream.hh],,AC_MSG_ERROR([unable to find log4shib header files]))
        AC_TRY_LINK(
@@ -182,7 +182,7 @@ else
            ])
        if test -f "${LOG4CPP_CONFIG}"; then
                AC_MSG_WARN([will try to use log4cpp, note that most non-Internet2 supplied versions are not thread-safe])
-           LDFLAGS="`${LOG4CPP_CONFIG} --libs` $LDFLAGS"
+           LIBS="`${LOG4CPP_CONFIG} --libs` $LIBS"
            CPPFLAGS="`${LOG4CPP_CONFIG} --cflags` $CPPFLAGS"
                AC_CHECK_HEADER([log4cpp/CategoryStream.hh],,AC_MSG_ERROR([unable to find log4cpp header files]))
                AC_TRY_LINK(
@@ -265,10 +265,20 @@ save_LIBS="$LIBS"
 LIBS="$XMLSEC_LIBS $LIBS"
 
 AC_TRY_LINK(
-    [#include <xmltooling/io/HTTPResponse.h>],
-    [xmltooling::HTTPResponse::sanitizeURL("http://test")],
+       [
+#include <xmltooling/XMLToolingConfig.h>
+#include <xmltooling/version.h>
+       ],
+       [
+#if _XMLTOOLING_VERSION >= 10400
+xmltooling::XMLToolingConfig::getConfig();
+#else
+#error Need XMLTooling version 1.4 or higher
+#endif
+       ],
     [AC_DEFINE(HAVE_XMLTOOLING,1,[Define if xmltooling library was found])],
-    [AC_MSG_ERROR([unable to link with XMLTooling, or version was too old])])
+    [AC_MSG_ERROR([unable to link with XMLTooling, or version was too old])]
+       )
 
 # restore master libs
 LIBS="$save_LIBS"
@@ -350,15 +360,20 @@ LIBS="$XMLSEC_LIBS $LIBS"
 AC_CHECK_HEADER([saml/saml2/metadata/Metadata.h],,
                 AC_MSG_ERROR([unable to find OpenSAML header files]))
 AC_TRY_LINK(
-       [#include <saml/SAMLConfig.h>
-#include <saml/version.h>],
-       [#if _OPENSAML_VERSION >= 20200
+       [
+#include <saml/SAMLConfig.h>
+#include <saml/version.h>
+       ],
+       [
+#if _OPENSAML_VERSION >= 20400
 opensaml::SAMLConfig::getConfig();
 #else
-#error Need OpenSAML version 2.2 or higher
-#endif],
-        [AC_DEFINE(HAVE_SAML,1,[Define if saml library was found])],
-        [AC_MSG_ERROR([unable to link with OpenSAML, or version was too old])])
+#error Need OpenSAML version 2.4 or higher
+#endif
+       ],
+    [AC_DEFINE(HAVE_SAML,1,[Define if saml library was found])],
+    [AC_MSG_ERROR([unable to link with OpenSAML, or version was too old])]
+       )
 
 # restore master libs
 LIBS="$save_LIBS"
@@ -742,7 +757,7 @@ if test "$WANT_APACHE_20" = "yes" ; then
 
     # extract settings we need from APXS2 -q
     APXS2_CC="`$APXS2 -q CC`"
-    APXS2_CFLAGS="`$APXS2 -q CPPFLAGS` `$APXS2 -q CFLAGS` $APU_CFLAGS"
+    APXS2_CFLAGS="`$APXS2 -q CPPFLAGS` `$APXS2 -q CFLAGS` $APR_CFLAGS $APU_CFLAGS"
     APXS2_INCLUDE="`$APXS2 -q INCLUDEDIR`"
 fi