X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-xmltooling.git;a=blobdiff_plain;f=configure.ac;h=35938e2829f9834795b3867493fc906e99ed5146;hp=6e78970c4c9a9be37f3b2394020afea82c71e2b8;hb=HEAD;hpb=eab22660b1e5678870b4750af89a963476e38c3f diff --git a/configure.ac b/configure.ac index 6e78970..35938e2 100644 --- a/configure.ac +++ b/configure.ac @@ -1,12 +1,12 @@ +# Process this file with autoreconf AC_PREREQ([2.50]) -AC_INIT([xmltooling], [1.4], [mace-opensaml-users@internet2.edu], [xmltooling]) -AM_CONFIG_HEADER(config.h) -AM_CONFIG_HEADER(xmltooling/config_pub.h) -AM_INIT_AUTOMAKE([xmltooling], [1.4]) - -sinclude(doxygen.m4) -sinclude(acx_pthread.m4) -sinclude(ax_create_pkgconfig_info.m4) +AC_INIT([xmltooling],[1.5.6],[https://issues.shibboleth.net/],[xmltooling]) +AC_CONFIG_SRCDIR(xmltooling) +AC_CONFIG_AUX_DIR(build-aux) +AC_CONFIG_MACRO_DIR(m4) +AM_INIT_AUTOMAKE +AC_DISABLE_STATIC +AC_PROG_LIBTOOL # Docygen features DX_HTML_FEATURE(ON) @@ -20,7 +20,7 @@ DX_PS_FEATURE(OFF) DX_INIT_DOXYGEN(xmltooling, doxygen.cfg, doc/api) AC_ARG_ENABLE(debug, - AC_HELP_STRING(--enable-debug, [Have GCC compile with symbols (Default = no)]), + AS_HELP_STRING([--enable-debug],[Have GCC compile with symbols (Default = no)]), enable_debug=$enableval, enable_debug=no) if test "$enable_debug" = "yes" ; then @@ -31,6 +31,10 @@ else GCC_CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG" fi +AC_CONFIG_HEADERS([config.h xmltooling/config_pub.h]) +AC_CONFIG_FILES([xmltooling.spec]) +AC_CONFIG_FILES([Makefile xmltooling/Makefile xmltoolingtest/Makefile schemas/Makefile doc/Makefile]) + AC_PROG_CC([gcc gcc3 cc]) AC_PROG_CXX([g++ g++3 c++ CC]) AC_CANONICAL_HOST @@ -45,27 +49,26 @@ if test "$GCC" = "yes" ; then # ]) CFLAGS="-Wall $GCC_CFLAGS" CXXFLAGS="-Wall $GCC_CXXFLAGS" -else -# Fix for Sun Workshop compiler in debug mode, may be Sun case #6360993 - case "${host_cpu}-${host_os}" in - *solaris*) - if test "$CXX" = "CC" ; then - CXXFLAGS="$CXXFLAGS -Qoption ccfe -stabs=no%dfltlit+no%dflthlp" - fi - ;; - esac fi -AC_DISABLE_STATIC -AC_PROG_LIBTOOL +# Fix for Sun Workshop compiler in debug mode, may be Sun case #6360993 +# Also enables POSIX semantics for some functions. +case "${host_cpu}-${host_os}" in + *solaris*) + CFLAGS="$CFLAGS -D_POSIX_PTHREAD_SEMANTICS" + CXXFLAGS="$CXXFLAGS -D_POSIX_PTHREAD_SEMANTICS" + if test "$CXX" = "CC" ; then + CXXFLAGS="$CXXFLAGS -Qoption ccfe -stabs=no%dfltlit+no%dflthlp" + fi + ;; +esac # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST AC_TYPE_SIZE_T -AC_CHECK_SIZEOF([long]) # Checks for library functions. -AC_CHECK_FUNCS([strchr strdup strstr timegm strcasecmp]) +AC_CHECK_FUNCS([strchr strdup strstr timegm gmtime_r strcasecmp]) AC_CHECK_HEADERS([dlfcn.h]) AC_CHECK_FUNC(dlclose, , [ AC_CHECK_LIB(dl, dlopen) ]) @@ -74,7 +77,7 @@ ACX_PTHREAD([enable_threads="pthread"],[enable_threads="no"]) if test $enable_threads != "pthread"; then AC_MSG_ERROR([unable to find pthreads, currently this is required]) else - AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]) + AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.]) AM_CONDITIONAL(BUILD_PTHREAD,test "$enable_threads" = "pthread") LIBS="$PTHREAD_LIBS $LIBS" CFLAGS="$PTHREAD_CFLAGS $CFLAGS" @@ -83,89 +86,98 @@ fi AC_CHECK_FUNCS([pthread_rwlock_init]) -AC_LANG(C++) +AC_LANG([C++]) # C++ requirements -AC_CXX_REQUIRE_STL AC_CXX_NAMESPACES +AC_CXX_REQUIRE_STL + +# Boost +BOOST_REQUIRE +BOOST_BIND +BOOST_CONVERSION +BOOST_LAMBDA +BOOST_POINTER_CONTAINER +BOOST_SMART_PTR +BOOST_STRING_ALGO +BOOST_TOKENIZER +CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS" # are covariant methods allowed? AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[]], - [[ - 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 to 1 if C++ compiler supports covariant virtual methods.])] - ) + [AC_LANG_PROGRAM([[]], + [[ + 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 to 1 if C++ compiler supports covariant virtual methods.])]) # is nullptr supported? AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[]], - [[ - const char* ptr = nullptr; - ]])], - [AC_DEFINE([HAVE_NULLPTR], [1], [Define to 1 if C++ compiler supports nullptr keyword.])] - ) + [AC_LANG_PROGRAM([[]],[[const char* ptr = nullptr;]])], + [AC_DEFINE([HAVE_NULLPTR],[1],[Define to 1 if C++ compiler supports nullptr keyword.])]) # log4shib settings (favor this version over the log4cpp code) AC_PATH_PROG(LOG4SHIB_CONFIG,log4shib-config) AC_ARG_WITH(log4shib, - AC_HELP_STRING([--with-log4shib=PATH], [where log4shib-config is installed]), + AS_HELP_STRING([--with-log4shib=PATH],[where log4shib-config is installed]), [ LOG4SHIB_CONFIG="${with_log4shib}" if ! test -f "${LOG4SHIB_CONFIG}" ; then LOG4SHIB_CONFIG="${with_log4shib}/bin/log4shib-config" fi ]) -if test -f "${LOG4SHIB_CONFIG}"; then +if test -f "${LOG4SHIB_CONFIG}" ; then 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( - [#include -#include ], - [log4shib::Category::getInstance("foo").errorStream() << log4shib::eol], - [AC_DEFINE([XMLTOOLING_LOG4SHIB], [1], [Define to 1 if log4shib library is used.])], - [AC_MSG_ERROR([unable to link with log4shib])]) + AC_CHECK_HEADER([log4shib/CategoryStream.hh],,AC_MSG_ERROR([unable to find log4shib header files])) + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[#include +#include ]], + [[log4shib::Category::getInstance("foo").errorStream() << log4shib::eol]])], + [AC_DEFINE([XMLTOOLING_LOG4SHIB],[1],[Define to 1 if log4shib library is used.])], + [AC_MSG_ERROR([unable to link with log4shib])]) else AC_MSG_WARN([log4shib-config not found, may need to use --with-log4shib option]) AC_MSG_WARN([will look for original log4cpp library]) - # log4cpp settings - AC_PATH_PROG(LOG4CPP_CONFIG,log4cpp-config) - AC_ARG_WITH(log4cpp, - AC_HELP_STRING([--with-log4cpp=PATH], [where log4cpp-config is installed]), - [ - LOG4CPP_CONFIG="${with_log4cpp}" - if ! test -f "${LOG4CPP_CONFIG}" ; then - LOG4CPP_CONFIG="${with_log4cpp}/bin/log4cpp-config" - fi - ]) - 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]) - 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( - [#include -#include ], - [log4cpp::Category::getInstance("foo").errorStream() << log4cpp::eol], - [AC_DEFINE([XMLTOOLING_LOG4CPP], [1], [Define to 1 if log4cpp library is used.])], - [AC_MSG_ERROR([unable to link with log4cpp, need version 1.0 or later])]) + # log4cpp settings + AC_PATH_PROG(LOG4CPP_CONFIG,log4cpp-config) + AC_ARG_WITH(log4cpp, + AS_HELP_STRING([--with-log4cpp=PATH],[where log4cpp-config is installed]), + [ + LOG4CPP_CONFIG="${with_log4cpp}" + if ! test -f "${LOG4CPP_CONFIG}" ; then + LOG4CPP_CONFIG="${with_log4cpp}/bin/log4cpp-config" + fi + ]) + 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]) + 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_LINK_IFELSE( + [AC_LANG_PROGRAM([[#include +#include ]], + [[log4cpp::Category::getInstance("foo").errorStream() << log4cpp::eol]])], + [AC_DEFINE([XMLTOOLING_LOG4CPP],[1],[Define to 1 if log4cpp library is used.])], + [AC_MSG_ERROR([unable to link with log4cpp, need version 1.0 or later])]) else AC_MSG_ERROR([log4cpp-config not found, may need to use --with-log4cpp option]) fi fi # Xerces settings -AC_ARG_WITH(xerces, - AC_HELP_STRING([--with-xerces=PATH], [where xerces-c is installed]), - [if test x_$with_xerces != x_/usr; then - LDFLAGS="-L${with_xerces}/lib $LDFLAGS" - CPPFLAGS="-I${with_xerces}/include $CPPFLAGS" - fi]) -LIBS="-lxerces-c $LIBS" +AC_ARG_WITH(xerces, + AS_HELP_STRING([--with-xerces=PATH],[where xerces-c is installed]),, + [with_xerces=/usr]) +if test x_$with_xerces != x_/usr; then + CPPFLAGS="-I${with_xerces}/include $CPPFLAGS" + LIBS="-L${with_xerces}/lib -lxerces-c $LIBS" +else + LIBS="-lxerces-c $LIBS" +fi + AC_CHECK_HEADER([xercesc/dom/DOM.hpp],,AC_MSG_ERROR([unable to find xerces header files])) AC_MSG_CHECKING([Xerces version]) AC_PREPROC_IFELSE( @@ -177,72 +189,58 @@ int i = 0; #endif])], [AC_MSG_RESULT(OK)], [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::XMLPlatformUtils::Initialize()], - [AC_DEFINE([HAVE_LIBXERCESC], [1], [Define to 1 if Xerces-C library was found])], - [AC_MSG_ERROR([unable to link with Xerces])]) +AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[#include ]], + [[xercesc::XMLPlatformUtils::Initialize()]])], + ,[AC_MSG_ERROR([unable to link with Xerces])]) AC_MSG_CHECKING([whether Xerces is 64-bit clean]) -AC_TRY_COMPILE([#include ], - [using namespace XERCES_CPP_NAMESPACE; - XMLFilePos testvar; - ], - [AC_MSG_RESULT([yes])] - [AC_DEFINE([XMLTOOLING_XERCESC_64BITSAFE], [1], [Define to 1 if Xerces has a 64-bit-safe API.])], +AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[#include ]], + [[using namespace XERCES_CPP_NAMESPACE; XMLFilePos testvar;]])], + [AC_MSG_RESULT([yes])AC_DEFINE([XMLTOOLING_XERCESC_64BITSAFE],[1],[Define to 1 if Xerces has a 64-bit-safe API.])], [AC_MSG_RESULT([no])]) AC_MSG_CHECKING([whether Xerces BinInputStream requires getContentType]) -AC_TRY_COMPILE([#include ], - [using namespace XERCES_CPP_NAMESPACE; - XMLByte buf[1024]; - BinMemInputStream in(buf,1024); - in.getContentType(); - ], - [AC_MSG_RESULT([yes])] - [AC_DEFINE([XMLTOOLING_XERCESC_INPUTSTREAM_HAS_CONTENTTYPE], [1], [Define to 1 if Xerces InputStream class requires getContentType.])], +AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[#include ]], + [[using namespace XERCES_CPP_NAMESPACE; XMLByte buf[1024]; BinMemInputStream in(buf,1024); in.getContentType();]])], + [AC_MSG_RESULT([yes])AC_DEFINE([XMLTOOLING_XERCESC_INPUTSTREAM_HAS_CONTENTTYPE],[1],[Define to 1 if Xerces InputStream class requires getContentType.])], [AC_MSG_RESULT([no])]) AC_MSG_CHECKING([whether Xerces DOMLS API is compliant]) -AC_TRY_COMPILE([#include ], - [using namespace XERCES_CPP_NAMESPACE; +AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[#include ]], + [[using namespace XERCES_CPP_NAMESPACE; DOMImplementation *impl = DOMImplementationRegistry::getDOMImplementation(NULL); - DOMLSSerializer *ls = ((DOMImplementationLS*)impl)->createLSSerializer(); - ], - [AC_MSG_RESULT([yes])] - [AC_DEFINE([XMLTOOLING_XERCESC_COMPLIANT_DOMLS], [1], [Define to 1 if Xerces supports a compliant DOMLS API.])], + DOMLSSerializer *ls = ((DOMImplementationLS*)impl)->createLSSerializer();]])], + [AC_MSG_RESULT([yes])AC_DEFINE([XMLTOOLING_XERCESC_COMPLIANT_DOMLS],[1],[Define to 1 if Xerces supports a compliant DOMLS API.])], [AC_MSG_RESULT([no])]) AC_MSG_CHECKING([whether Xerces has setIdAttribute(XMLCh*, bool)]) -AC_TRY_COMPILE([#include ], - [using namespace XERCES_CPP_NAMESPACE; - DOMElement * elt; - elt->setIdAttribute(NULL, false); - ], - [AC_MSG_RESULT([yes])] - [AC_DEFINE([XMLTOOLING_XERCESC_BOOLSETIDATTRIBUTE], [1], [Define to 1 if Xerces DOM ID methods take extra parameter.])], - [AC_MSG_RESULT([no])]) +AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[#include ]], + [[using namespace XERCES_CPP_NAMESPACE; DOMElement * elt; elt->setIdAttribute(NULL, false);]])], + [AC_MSG_RESULT([yes])AC_DEFINE([XMLTOOLING_XERCESC_BOOLSETIDATTRIBUTE],[1],[Define to 1 if Xerces DOM ID methods take extra parameter.])], + [AC_MSG_RESULT([no])]) AC_MSG_CHECKING([whether Xerces XMLString::release(XMLByte**) exists]) -AC_TRY_COMPILE([#include ], - [using namespace XERCES_CPP_NAMESPACE; - XMLByte* buf=NULL; - XMLString::release(&buf); - ], - [AC_MSG_RESULT([yes])] - [AC_DEFINE([XMLTOOLING_XERCESC_HAS_XMLBYTE_RELEASE], [1], [Define to 1 if Xerces XMLString includes XMLByte release.])], +AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[#include ]], + [[using namespace XERCES_CPP_NAMESPACE; XMLByte* buf=NULL; XMLString::release(&buf);]])], + [AC_MSG_RESULT([yes])AC_DEFINE([XMLTOOLING_XERCESC_HAS_XMLBYTE_RELEASE],[1],[Define to 1 if Xerces XMLString includes XMLByte release.])], [AC_MSG_RESULT([no])]) # XML-Security settings AC_ARG_WITH(xmlsec, - AC_HELP_STRING([--with-xmlsec=PATH], [where xmlsec is installed]),, - [with_xmlsec=/usr]) + AS_HELP_STRING([--with-xmlsec=PATH], [where xmlsec is installed]),, + [with_xmlsec=/usr]) if test x_$with_xmlsec != x_no; then # OpenSSL settings (need to do this first in case it's in a different spot from xmlsec) AC_ARG_WITH(openssl, - AC_HELP_STRING([--with-openssl=PATH], [where openssl is installed]), + 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" @@ -277,21 +275,27 @@ if test x_$with_xmlsec != x_no; then save_LIBS="$LIBS" LIBS="$XMLSEC_LIBS $LIBS" - AC_CHECK_HEADER([openssl/pem.h],, - AC_MSG_ERROR([unable to find openssl header files])) + AC_CHECK_HEADER([openssl/pem.h],,AC_MSG_ERROR([unable to find openssl header files])) AC_MSG_CHECKING(for ERR_load_CRYPTO_string) - AC_TRY_LINK_FUNC([ERR_load_CRYPTO_strings],, - AC_MSG_ERROR([unable to link with openssl libraries])) + AC_TRY_LINK_FUNC([ERR_load_CRYPTO_strings],,AC_MSG_ERROR([unable to link with openssl libraries])) AC_MSG_RESULT(yes) + AC_CHECK_DECL(EVP_sha512, + [AC_DEFINE([XMLTOOLING_OPENSSL_HAVE_SHA2],[1],[Define to 1 if OpenSSL supports the SHA-2 hash family.])], + ,[#include ]) + AC_CHECK_DECL(EVP_PKEY_set1_EC_KEY, + [AC_DEFINE([XMLTOOLING_OPENSSL_HAVE_EC],[1],[Define to 1 if OpenSSL has EC support.])], + ,[#include ]) + # restore master libs LIBS="$save_LIBS" if test x_$with_xmlsec != x_/usr; then CPPFLAGS="-I${with_xmlsec}/include $CPPFLAGS" - LDFLAGS="-L${with_xmlsec}/lib $LDFLAGS" - fi - XMLSEC_LIBS="$XMLSEC_LIBS -lxml-security-c" + XMLSEC_LIBS="-L${with_xmlsec}/lib -lxml-security-c $XMLSEC_LIBS" + else + XMLSEC_LIBS="-lxml-security-c $XMLSEC_LIBS" + fi # save and append master libs save_LIBS="$LIBS" @@ -308,91 +312,110 @@ int i = 0; #endif])], [AC_MSG_RESULT(OK)], [AC_MSG_FAILURE([XML-Security version 1.4.0 or greater is required.])]) - AC_TRY_LINK( - [#include ], - [XSECPlatformUtils::Initialise()],, - [AC_MSG_ERROR([unable to link with XML-Security])]) - AC_CHECK_TYPE([xsecsize_t],[AC_DEFINE([HAVE_XSECSIZE_T], [1], [Define to 1 if you have the 'xsecsize_t' type.])]) + + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[#include ]], + [[XSECPlatformUtils::Initialise()]])],, + [AC_MSG_ERROR([unable to link with XML-Security])]) + AC_CHECK_TYPE([xsecsize_t],[AC_DEFINE([HAVE_XSECSIZE_T],[1],[Define to 1 if you have the 'xsecsize_t' type.])]) AC_MSG_CHECKING([whether XML-Security-C has multiple CRL support]) - AC_TRY_COMPILE([#include ], - [DSIGKeyInfoList* klist; klist->getX509CRLListSize();], - [AC_MSG_RESULT([yes])] - [AC_DEFINE([XMLTOOLING_XMLSEC_MULTIPLECRL], [1], [Define to 1 if XML-Security-C handles multiple CRLs.])], - [AC_MSG_RESULT([no])]) + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[#include ]], + [[DSIGKeyInfoX509* klist; klist->getX509CRLListSize();]])], + [AC_MSG_RESULT([yes])AC_DEFINE([XMLTOOLING_XMLSEC_MULTIPLECRL],[1],[Define to 1 if XML-Security-C handles multiple CRLs.])], + [AC_MSG_RESULT([no])]) AC_MSG_CHECKING([whether XML-Security-C exposes the signature algorithm URI]) - AC_TRY_COMPILE([#include ], - [DSIGSignature* sig; sig->getAlgorithmURI();], - [AC_MSG_RESULT([yes])] - [AC_DEFINE([XMLTOOLING_XMLSEC_SIGALGORITHM], [1], [Define to 1 if XML-Security-C exposes the signature algorithm URI.])], - [AC_MSG_RESULT([no])]) - - # restore master libs - LIBS="$save_LIBS" - - # 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 - CPPFLAGS="`${CURL_CONFIG} --cflags` $CPPFLAGS" - XMLSEC_LIBS="`${CURL_CONFIG} --libs` $XMLSEC_LIBS" - else - AC_MSG_ERROR([curl-config not found, may need to use --with-curl option]) - fi + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[#include ]], + [[DSIGSignature* sig; sig->getAlgorithmURI();]])], + [AC_MSG_RESULT([yes])AC_DEFINE([XMLTOOLING_XMLSEC_SIGALGORITHM],[1],[Define to 1 if XML-Security-C exposes the signature algorithm URI.])], + [AC_MSG_RESULT([no])]) + + AC_MSG_CHECKING([whether XML-Security-C includes ECC support]) + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[#include ]], + [[DSIGKeyInfoValue* info; info->getECNamedCurve();]])], + [AC_MSG_RESULT([yes])AC_DEFINE([XMLTOOLING_XMLSEC_ECC],[1],[Define to 1 if XML-Security-C includes ECC support.])], + [AC_MSG_RESULT([no])]) + + AC_MSG_CHECKING([whether XML-Security-C includes C14N 1.1 support]) + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[#include ]], + [[transformType t = TRANSFORM_C14N11;]])], + [AC_MSG_RESULT([yes])AC_DEFINE([XMLTOOLING_XMLSEC_C14N11],[1],[Define to 1 if XML-Security-C includes C14N 1.1 support.])], + [AC_MSG_RESULT([no])]) + + AC_MSG_CHECKING([whether XML-Security-C includes debug logging support]) + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[#include ]], + [[XSECPlatformUtils::SetReferenceLoggingSink(NULL)]])], + [AC_MSG_RESULT([yes])AC_DEFINE([XMLTOOLING_XMLSEC_DEBUGLOGGING],[1],[Define to 1 if XML-Security-C includes debug logging support.])], + [AC_MSG_RESULT([no])]) + + # restore master libs + LIBS="$save_LIBS" + + # libcurl settings + AC_PATH_PROG(CURL_CONFIG,curl-config) + AC_ARG_WITH(curl, + AS_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 + CPPFLAGS="`${CURL_CONFIG} --cflags` $CPPFLAGS" + XMLSEC_LIBS="`${CURL_CONFIG} --libs` $XMLSEC_LIBS" + else + AC_MSG_ERROR([curl-config not found, may need to use --with-curl option]) + fi - # save and append master libs - save_LIBS="$LIBS" - LIBS="$XMLSEC_LIBS $LIBS" + # save and append master libs + save_LIBS="$LIBS" + LIBS="$XMLSEC_LIBS $LIBS" - 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_CHECK_TYPE([curl_off_t],[AC_DEFINE([HAVE_CURL_OFF_T], [1], [Define to 1 if you have the 'curl_off_t' type.])]) - - # restore master libs - LIBS="$save_LIBS" - - AC_SUBST(XMLSEC_LIBS) + AC_CHECK_HEADER([curl/curl.h],,AC_MSG_ERROR([unable to find libcurl header files])) + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[#include ]], + [[curl_global_init(CURL_GLOBAL_ALL)]])],, + [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_CHECK_TYPE([curl_off_t],[AC_DEFINE([HAVE_CURL_OFF_T],[1],[Define to 1 if you have the 'curl_off_t' type.])],,[[#include ]]) + + # restore master libs + LIBS="$save_LIBS" + + AC_SUBST(XMLSEC_LIBS) else AC_MSG_WARN([xmlsec disabled, building without signature/encryption support]) - AC_DEFINE([XMLTOOLING_NO_XMLSEC], [1], [Define to 1 if you wish to disable XML-Security-dependent features.]) + AC_DEFINE([XMLTOOLING_NO_XMLSEC],[1],[Define to 1 if you wish to disable XML-Security-dependent features.]) fi AM_CONDITIONAL(BUILD_XMLSEC,test x_$with_xmlsec != x_no) # Does the STL in use help or screw us? -AC_TRY_LINK( - [#include ], - [std::basic_string foo; foo=foo+(unsigned short)65], - [AC_DEFINE([HAVE_GOOD_STL], [1], - [Define to 1 if you have an STL implementation that supports useful string specialization.])], - ) -AC_TRY_LINK( - [#include ], - [std::iterator_traits::iterator>::value_type foo=0], - [AC_DEFINE([HAVE_ITERATOR_TRAITS], [1], - [Define to 1 if you have an STL implementation that supports std::iterator_traits.])], - ) +AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[#include ]],[[std::basic_string foo; foo=foo+(unsigned short)65]])], + [AC_DEFINE([HAVE_GOOD_STL],[1],[Define to 1 if you have an STL implementation that supports useful string specialization.])],[]) +AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[#include ]],[[std::iterator_traits::iterator>::value_type foo=0]])], + [AC_DEFINE([HAVE_ITERATOR_TRAITS],[1],[Define to 1 if you have an STL implementation that supports std::iterator_traits.])],[]) # Check for unit test support CXXTEST="/usr/bin/cxxtestgen.pl" CXXTESTFLAGS="" AC_ARG_WITH(cxxtest, - AC_HELP_STRING([--with-cxxtest=PATH], [where cxxtest is installed]), - [if test x_$with_cxxtest != x_/usr; then - CXXTEST="${with_cxxtest}/cxxtestgen.pl" - CXXTESTFLAGS="-I${with_cxxtest}" - fi]) + AS_HELP_STRING([--with-cxxtest=PATH], [where cxxtest is installed]), + [if test x_$with_cxxtest != x_/usr; then + CXXTEST="${with_cxxtest}/cxxtestgen.pl" + CXXTESTFLAGS="-I${with_cxxtest}" + fi]) if ! test -f "${CXXTEST}"; then AC_MSG_WARN([cxxtestgen not found, won't build unit tests]) fi @@ -406,6 +429,4 @@ AX_CREATE_PKGCONFIG_INFO(,,[$XMLSEC_LIBS -lxmltooling],[OpenSAML XMLTooling-C li LIBTOOL="$LIBTOOL --silent" # output packaging and makefiles -AC_CONFIG_FILES([xmltooling.spec pkginfo Portfile]) -AC_CONFIG_FILES([Makefile xmltooling/Makefile xmltoolingtest/Makefile schemas/Makefile doc/Makefile]) AC_OUTPUT