X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-opensaml.git;a=blobdiff_plain;f=configure.ac;h=c5330c0dcb8c45b99d44ebd6cce38810fed2adce;hp=965037e2a8a84e50f9ebb3e2eb2f01a78a6dea9f;hb=07dbbcf3a8fc0aba6fefe741f1760442a0a6ea65;hpb=e614d5f693d82e493d3fb189ece2fe2709ed07e0 diff --git a/configure.ac b/configure.ac index 965037e..c5330c0 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ([2.50]) -AC_INIT([opensaml], [2.0], [mace-opensaml-users@internet2.edu], [saml]) +AC_INIT([opensaml], [2.2], [mace-opensaml-users@internet2.edu], [saml]) AM_CONFIG_HEADER(config.h) -#AM_CONFIG_HEADER(saml/config_pub.h) -AM_INIT_AUTOMAKE([opensaml], [2.0]) +AM_INIT_AUTOMAKE([opensaml], [2.2]) sinclude(doxygen.m4) +sinclude(acx_pthread.m4) # Docygen features DX_HTML_FEATURE(ON) @@ -32,6 +32,7 @@ fi AC_PROG_CC([gcc gcc3 cc]) AC_PROG_CXX([g++ g++3 c++ CC]) +AC_CANONICAL_HOST if test "$GCC" = "yes" ; then # AC_HAVE_GCC_VERSION(4,0,0,0, @@ -43,6 +44,15 @@ if test "$GCC" = "yes" ; then # ]) CFLAGS="$GCC_CFLAGS" CXXFLAGS="$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 @@ -54,31 +64,18 @@ AC_TYPE_SIZE_T # Checks for library functions. AC_CHECK_FUNCS([strchr strdup strstr]) - AC_CHECK_SIZEOF(time_t) -# 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" +# checks for pthreads +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_MSG_ERROR([curl-config not found, may need to use --with-curl option]) + AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]) + LIBS="$PTHREAD_LIBS $LIBS" + CFLAGS="$PTHREAD_CFLAGS $CFLAGS" + CXXFLAGS="$PTHREAD_CFLAGS $CXXFLAGS" 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])]) # zlib settings AC_ARG_WITH(zlib, @@ -93,36 +90,86 @@ AC_ARG_WITH(zlib, AC_CHECK_HEADER([zlib.h],,AC_MSG_ERROR([unable to find zlib header files])) AC_CHECK_LIB([z],[deflateInit2_],,AC_MSG_ERROR([unable to link with zlib library])) +# OpenSSL settings +AC_ARG_WITH(openssl, + AC_HELP_STRING([--with-openssl=PATH], [where openssl is installed]), + [if test x_$with_openssl != x_/usr; then + SSLFLAGS="-I${with_openssl}/include" + fi]) + +if test "x$SSLFLAGS" = "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 + SSLFLAGS="`$PKG_CONFIG --cflags openssl`" + else + AC_MSG_ERROR([OpenSSL not supported by pkg-config, try --with-openssl instead]) + fi + fi +fi + +AC_MSG_CHECKING(for OpenSSL cflags) +AC_MSG_RESULT($SSLFLAGS) +CPPFLAGS="$SSLFLAGS $CPPFLAGS" + +AC_CHECK_HEADER([openssl/x509.h],, + AC_MSG_ERROR([unable to find openssl header files])) + AC_LANG(C++) # C++ requirements AC_CXX_REQUIRE_STL AC_CXX_NAMESPACES -# log4cpp settings -AC_PATH_PROG(LOG4CPP_CONFIG,log4cpp-config) -AC_ARG_WITH(log4cpp, - AC_HELP_STRING([--with-log4cpp=PATH], [where log4cpp-config is installed]), +# 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]), [ - LOG4CPP_CONFIG="${with_log4cpp}" - if ! test -f "${LOG4CPP_CONFIG}" ; then - LOG4CPP_CONFIG="${with_log4cpp}/bin/log4cpp-config" + LOG4SHIB_CONFIG="${with_log4shib}" + if ! test -f "${LOG4SHIB_CONFIG}" ; then + LOG4SHIB_CONFIG="${with_log4shib}/bin/log4shib-config" fi ]) -if test -f "${LOG4CPP_CONFIG}"; then - LDFLAGS="`${LOG4CPP_CONFIG} --libs` $LDFLAGS" - CPPFLAGS="`${LOG4CPP_CONFIG} --cflags` $CPPFLAGS" +if test -f "${LOG4SHIB_CONFIG}"; then + LDFLAGS="`${LOG4SHIB_CONFIG} --libs` $LDFLAGS" + 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(OPENSAML_LOG4SHIB,1,[Define if log4shib library is used.])], + [AC_MSG_ERROR([unable to link with log4shib])]) else - AC_MSG_ERROR([log4cpp-config not found, may need to use --with-log4cpp option]) - LIBS="-llog4cpp $LIBS" + 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]) + LDFLAGS="`${LOG4CPP_CONFIG} --libs` $LDFLAGS" + 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(OPENSAML_LOG4CPP,1,[Define 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 -AC_CHECK_HEADER([log4cpp/Category.hh],,AC_MSG_ERROR([unable to find log4cpp header files])) -AC_CHECK_HEADER([log4cpp/PropertyConfigurator.hh],,AC_MSG_ERROR([you need at least log4cpp 0.3.x])) -AC_TRY_LINK( - [#include ], - [log4cpp::Category::getInstance("foo")], - [AC_DEFINE(HAVE_LIBLOG4CPP,1,[Define if log4cpp library was found])], - [AC_MSG_ERROR([unable to link with log4cpp])]) # Xerces settings AC_ARG_WITH(xerces, @@ -149,6 +196,15 @@ AC_TRY_LINK( [AC_DEFINE(HAVE_LIBXERCESC,1,[Define if Xerces-C library was found])], [AC_MSG_ERROR([unable to link with Xerces])]) +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([OPENSAML_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, @@ -159,11 +215,21 @@ AC_ARG_WITH(xmlsec, fi]) LIBS="-lxml-security-c $LIBS" AC_CHECK_HEADER([xsec/utils/XSECPlatformUtils.hpp],,AC_MSG_ERROR([unable to find xmlsec header files])) +AC_MSG_CHECKING([XML-Security version]) +AC_PREPROC_IFELSE( + [AC_LANG_PROGRAM([#include ], + [#if XSEC_VERSION_MAJOR > 1 || (XSEC_VERSION_MAJOR == 1 && XSEC_VERSION_MEDIUM > 3) +int i = 0; +#else +#error need version 1.4.0 or later +#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_DEFINE(HAVE_LIBXSEC,1,[Define if XML-Sec library was found])], - [AC_MSG_ERROR([unable to link with xmlsec library])] + [AC_DEFINE(HAVE_LIBXSEC,1,[Define if XML-Security library was found])], + [AC_MSG_ERROR([unable to link with XML-Security library])] ) # XML-Tooling settings @@ -177,19 +243,15 @@ AC_ARG_WITH(xmltooling, LIBS="-lxmltooling $LIBS" AC_CHECK_HEADER([xmltooling/XMLToolingConfig.h],,AC_MSG_ERROR([unable to find xmltooling header files])) AC_TRY_LINK( - [#include ], - [xmltooling::XMLToolingConfig::getConfig().init()], - [AC_DEFINE(HAVE_LIBXMLTOOLING,1,[Define if XML-Tooling library was found])], - [AC_MSG_ERROR([unable to link with xmltooling library])] - ) - -# 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 if you have an STL implementation that supports useful string specialization.])], - ) + [#include +#include ], + [#if _XMLTOOLING_VERSION >= 10200 +xmltooling::XMLToolingConfig::getConfig(); +#else +#error Need XMLTooling version 1.2 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])]) # Check for unit test support CXXTEST="/usr/bin/cxxtestgen.pl" @@ -212,4 +274,4 @@ AC_SUBST(DX_INCLUDE) LIBTOOL="$LIBTOOL --silent" # output makefiles -AC_OUTPUT(Makefile saml/Makefile samltest/Makefile schemas/Makefile) +AC_OUTPUT(Makefile saml/Makefile samltest/Makefile samlsign/Makefile schemas/Makefile doc/Makefile)