X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=36bc61776856dd7038fc5c76bbf2d24c4273e3d0;hb=3458f782da3d1638b087d9e935e0d177db29d31b;hp=bfd90ee8104ac7a6e37706289c93ea74c23f284c;hpb=0f6286d0ffd9371c187ecb1775cbd199ed051af5;p=shibboleth%2Fcpp-opensaml.git diff --git a/configure.ac b/configure.ac index bfd90ee..36bc617 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ AC_PREREQ([2.50]) -AC_INIT([opensaml], [2.0], [mace-opensaml-users@internet2.edu], [saml]) +AC_INIT([opensaml], [2.4], [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.4]) sinclude(doxygen.m4) sinclude(acx_pthread.m4) +sinclude(ax_create_pkgconfig_info.m4) # Docygen features DX_HTML_FEATURE(ON) @@ -98,13 +98,13 @@ 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 SSLFLAGS="`$PKG_CONFIG --cflags openssl`" else - AC_MSG_ERROR([OpenSSL not supported by pkg-config, try --with-openssl instead]) + AC_MSG_WARN([OpenSSL not supported by pkg-config, try --with-openssl instead]) fi fi fi @@ -133,8 +133,15 @@ 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( + [#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_WARN([log4shib-config not found, may need to use --with-log4shib option]) AC_MSG_WARN([will look for original log4cpp library]) @@ -151,25 +158,19 @@ 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( + [#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 - 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(OPENSAML_LOG4CPP,1,[Define if log4cpp library is used.])], - [AC_MSG_ERROR([unable to link with log4cpp])]) fi -AC_CHECK_HEADER([log4shib/Category.hh],,AC_MSG_ERROR([unable to find log4shib header files])) -AC_TRY_LINK( - [#include ], - [log4shib::Category::getInstance("foo")], - [AC_DEFINE(OPENSAML_LOG4SHIB,1,[Define if log4shib library is used.])], - [AC_MSG_ERROR([unable to link with log4shib])]) # Xerces settings AC_ARG_WITH(xerces, @@ -196,6 +197,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, @@ -209,18 +219,18 @@ AC_CHECK_HEADER([xsec/utils/XSECPlatformUtils.hpp],,AC_MSG_ERROR([unable to find 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) || (XSEC_VERSION_MAJOR == 1 && XSEC_VERSION_MEDIUM == 3 && XSEC_VERSION_MINOR > 0) + [#if XSEC_VERSION_MAJOR > 1 || (XSEC_VERSION_MAJOR == 1 && XSEC_VERSION_MEDIUM > 3) int i = 0; #else -#error need version 1.3.1 or later +#error need version 1.4.0 or later #endif])], [AC_MSG_RESULT(OK)], - [AC_MSG_FAILURE([XML-Security version 1.3.1 or greater is required.])]) + [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 @@ -233,20 +243,21 @@ AC_ARG_WITH(xmltooling, fi]) 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 >= 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])]) # Check for unit test support CXXTEST="/usr/bin/cxxtestgen.pl" @@ -265,8 +276,12 @@ AC_SUBST(CXXTEST) AC_SUBST(CXXTESTFLAGS) AM_CONDITIONAL(BUILD_UNITTEST,test -f ${CXXTEST}) +AX_CREATE_PKGCONFIG_INFO(,,[$LIBS -lsaml],[OpenSAML library]) + AC_SUBST(DX_INCLUDE) LIBTOOL="$LIBTOOL --silent" -# output makefiles -AC_OUTPUT(Makefile saml/Makefile samltest/Makefile schemas/Makefile doc/Makefile) +# output packaging and makefiles +AC_CONFIG_FILES([opensaml.spec pkginfo Portfile]) +AC_CONFIG_FILES([Makefile saml/Makefile samltest/Makefile samlsign/Makefile schemas/Makefile doc/Makefile]) +AC_OUTPUT