X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=5fc90f1ac1a18c4e205ba4b5fffd2a26b87d2199;hb=f7f9d18169254074945d0886bf23fe3d57a97fe5;hp=e1490f45b82b092c1c3ea43c8e1f56e1c080b492;hpb=2b01797b71f857701efcb84bd3669585cb45febb;p=shibboleth%2Fcpp-opensaml.git diff --git a/configure.ac b/configure.ac index e1490f4..5fc90f1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ AC_PREREQ([2.50]) -AC_INIT([opensaml], [2.1.1], [mace-opensaml-users@internet2.edu], [saml]) +AC_INIT([opensaml], [2.3], [mace-opensaml-users@internet2.edu], [saml]) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE([opensaml], [2.1.1]) +AM_INIT_AUTOMAKE([opensaml], [2.3]) sinclude(doxygen.m4) sinclude(acx_pthread.m4) @@ -103,7 +103,7 @@ if test "x$SSLFLAGS" = "x" ; 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 @@ -196,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, @@ -234,15 +243,10 @@ 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 -#include ], - [#if _XMLTOOLING_VERSION >= 10100 -xmltooling::XMLToolingConfig::getConfig(); -#else -#error Need XMLTooling version 1.1 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])]) + [#include ], + [xmltooling::HTTPResponse::sanitizeURL("http://test")], + [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" @@ -264,5 +268,7 @@ AM_CONDITIONAL(BUILD_UNITTEST,test -f ${CXXTEST}) AC_SUBST(DX_INCLUDE) LIBTOOL="$LIBTOOL --silent" -# output makefiles -AC_OUTPUT(Makefile saml/Makefile samltest/Makefile samlsign/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