Porting fixes

[shibboleth/cpp-xmltooling.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 31b2d1c..d89710b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -53,7 +53,7 @@ AC_C_CONST
 AC_TYPE_SIZE_T
 
 # Checks for library functions.
-AC_CHECK_FUNCS([strchr strdup strstr])
+AC_CHECK_FUNCS([strchr strdup strstr timegm strcasecmp])
 AC_CHECK_HEADERS([dlfcn.h])
 AC_CHECK_FUNC(dlclose, , [ AC_CHECK_LIB(dl, dlopen) ])
 
@@ -107,12 +107,42 @@ AC_TRY_LINK_FUNC([ERR_load_CRYPTO_strings],,
              AC_MSG_ERROR([unable to link with openssl libraries]))
 AC_MSG_RESULT(yes)
 
+# libcurl settings
+AC_PATH_PROG(CURL_CONFIG,curl-config)
+AC_ARG_WITH(curl,
+    AC_HELP_STRING([--with-curl=PATH], [where curl-config is installed]),
+    [
+    CURL_CONFIG="${with_curl}"
+    if ! test -f "${CURL_CONFIG}" ; then
+       CURL_CONFIG="${with_curl}/bin/curl-config"
+    fi
+    ])
+if test -f "${CURL_CONFIG}" ; then
+    LDFLAGS="`${CURL_CONFIG} --libs` $LDFLAGS"
+    CPPFLAGS="`${CURL_CONFIG} --cflags` $CPPFLAGS"
+else
+    AC_MSG_ERROR([curl-config not found, may need to use --with-curl option])
+fi
+AC_CHECK_HEADER([curl/curl.h],,AC_MSG_ERROR([unable to find libcurl header files]))
+AC_CHECK_LIB([curl],[curl_global_init],,AC_MSG_ERROR([unable to link with libcurl]))
+AC_MSG_CHECKING([for CURLOPT_SSL_CTX_FUNCTION in curl.h])
+AC_EGREP_HEADER([CURLOPT_SSL_CTX_FUNCTION], [curl/curl.h],
+               [AC_MSG_RESULT(yes)],
+               [AC_MSG_ERROR([need libcurl that supports CURLOPT_SSL_CTX_FUNCTION])])
+
+
 AC_LANG(C++)
 
 # C++ requirements
 AC_CXX_REQUIRE_STL
 AC_CXX_NAMESPACES
 
+# are covariant methods allowed?
+AC_TRY_LINK(
+     [ class base { public: virtual base *GetPtr( void ) { return this; } }; ],
+     [ class derived: virtual public base { public: virtual derived *GetPtr( void ) { return this; } }; ],
+     [AC_DEFINE(HAVE_COVARIANT_RETURNS,1,[Define if C++ compiler supports covariant virtual methods.])])
+
 # log4cpp settings
 AC_PATH_PROG(LOG4CPP_CONFIG,log4cpp-config)
 AC_ARG_WITH(log4cpp,
@@ -156,7 +186,7 @@ int i = 0;
 #error cannot use version 2.6.0
 #endif])],
     [AC_MSG_RESULT(OK)],
-    [AC_MSG_FAILURE([Xerces-C v2.6.0 has bugs that inhibit use with signed XML, please use special 2.6.1 tarball provided by Shibboleth Project])])
+    [AC_MSG_FAILURE([Xerces-C v2.6.0 has bugs that inhibit use with signed XML, please use a newer version])])
 AC_TRY_LINK(
         [#include <xercesc/util/PlatformUtils.hpp>],
         [xercesc::XMLPlatformUtils::Initialize()],
@@ -179,13 +209,13 @@ if test x_$with_xmlsec != x_no; then
     AC_MSG_CHECKING([XML-Security version])
     AC_PREPROC_IFELSE(
            [AC_LANG_PROGRAM([#include <xsec/utils/XSECPlatformUtils.hpp>],
-        [#if XSEC_VERSION_MAJOR > 1 || XSEC_VERSION_MEDIUM >2 
+        [#if XSEC_VERSION_MAJOR > 1 || (XSEC_VERSION_MAJOR == 1 && XSEC_VERSION_MEDIUM > 3) || (XSEC_VERSION_MAJOR == 1 && XSEC_VERSION_MEDIUM == 3 && XSEC_VERSION_MINOR > 0)
 int i = 0;
 #else
-#error need version 1.3 or later
+#error need version 1.3.1 or later
 #endif])],
         [AC_MSG_RESULT(OK)],
-        [AC_MSG_FAILURE([XML-Security version 1.3 or greater is required.])])
+        [AC_MSG_FAILURE([XML-Security version 1.3.1 or greater is required.])])
     AC_TRY_LINK(
             [#include <xsec/utils/XSECPlatformUtils.hpp>],
             [XSECPlatformUtils::Initialise()],,
@@ -205,9 +235,6 @@ AC_TRY_LINK(
             [Define if you have an STL implementation that supports useful string specialization.])],
         )
 
-# check for timegm() support
-AC_CHECK_FUNC(timegm, AC_DEFINE(HAVE_TIMEGM,1,[Define to 1 if timegm is available]))
-
 # Check for unit test support
 CXXTEST="/usr/bin/cxxtestgen.pl"
 CXXTESTFLAGS=""