X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=de88c34133940fd331dd8a59edcd280fd1f08490;hb=d607c7e778c2c9cadf3a3605c6f66a400a2c223c;hp=ae4acd601e4897f8696eb6f4add023db735a6919;hpb=2e2b2f947427ba1de4bab019b5b3628302f4681b;p=shibboleth%2Fcpp-xmltooling.git diff --git a/configure.ac b/configure.ac index ae4acd6..de88c34 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ AC_PREREQ([2.50]) -AC_INIT([xmltooling], [1.0], [mace-opensaml-users@internet2.edu], [xmltooling]) +AC_INIT([xmltooling], [1.3], [mace-opensaml-users@internet2.edu], [xmltooling]) AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(xmltooling/config_pub.h) -AM_INIT_AUTOMAKE([xmltooling], [1.0]) +AM_INIT_AUTOMAKE([xmltooling], [1.3]) sinclude(doxygen.m4) sinclude(acx_pthread.m4) @@ -61,6 +61,7 @@ AC_PROG_LIBTOOL # 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]) @@ -91,7 +92,7 @@ AC_CXX_NAMESPACES 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.])]) + [AC_DEFINE([HAVE_COVARIANT_RETURNS], [1], [Define to 1 if C++ compiler supports covariant virtual methods.])]) # log4shib settings (favor this version over the log4cpp code) AC_PATH_PROG(LOG4SHIB_CONFIG,log4shib-config) @@ -106,11 +107,12 @@ AC_ARG_WITH(log4shib, if test -f "${LOG4SHIB_CONFIG}"; then LDFLAGS="`${LOG4SHIB_CONFIG} --libs` $LDFLAGS" CPPFLAGS="`${LOG4SHIB_CONFIG} --cflags` $CPPFLAGS" - AC_CHECK_HEADER([log4shib/Category.hh],,AC_MSG_ERROR([unable to find log4shib header files])) + AC_CHECK_HEADER([log4shib/CategoryStream.hh],,AC_MSG_ERROR([unable to find log4shib header files])) AC_TRY_LINK( - [#include ], - [log4shib::Category::getInstance("foo")], - [AC_DEFINE(XMLTOOLING_LOG4SHIB,1,[Define if log4shib library is used.])], + [#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]) @@ -130,13 +132,13 @@ else 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/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_CHECK_HEADER([log4cpp/CategoryStream.hh],,AC_MSG_ERROR([unable to find log4cpp header files])) AC_TRY_LINK( - [#include ], - [log4cpp::Category::getInstance("foo")], - [AC_DEFINE(XMLTOOLING_LOG4CPP,1,[Define if log4cpp library is used.])], - [AC_MSG_ERROR([unable to link with log4cpp])]) + [#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 @@ -164,9 +166,48 @@ int i = 0; AC_TRY_LINK( [#include ], [xercesc::XMLPlatformUtils::Initialize()], - [AC_DEFINE(HAVE_LIBXERCESC,1,[Define if Xerces-C library was found])], + [AC_DEFINE([HAVE_LIBXERCESC], [1], [Define to 1 if Xerces-C library was found])], [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_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_MSG_RESULT([no])]) + +AC_MSG_CHECKING([whether Xerces DOMLS API is compliant]) +AC_TRY_COMPILE([#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.])], + [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])]) # XML-Security settings AC_ARG_WITH(xmlsec, @@ -174,11 +215,59 @@ AC_ARG_WITH(xmlsec, [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]), + [if test x_$with_openssl != x_/usr; then + SSLFLAGS="-I${with_openssl}/include" + SSLLIBS="-L${with_openssl}/lib -lcrypto -lssl" + else + SSLLIBS="-lcrypto -lssl" + fi]) + + if test "x$SSLLIBS" = "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 + SSLLIBS="`$PKG_CONFIG --libs openssl`" + SSLFLAGS="`$PKG_CONFIG --cflags openssl`" + else + AC_MSG_ERROR([OpenSSL not supported by pkg-config, try --with-openssl instead]) + fi + fi + fi + + if test "x$SSLLIBS" = "x" ; then + SSLLIBS="-lcrypto -lssl" + fi + + AC_MSG_CHECKING(for OpenSSL cflags) + AC_MSG_RESULT($SSLFLAGS) + CPPFLAGS="$CPPFLAGS $SSLFLAGS" + AC_MSG_CHECKING(for OpenSSL libraries) + AC_MSG_RESULT($SSLLIBS) + XMLSEC_LIBS="$XMLSEC_LIBS $SSLLIBS" + + # save and append master libs + save_LIBS="$LIBS" + LIBS="$XMLSEC_LIBS $LIBS" + + 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_MSG_RESULT(yes) + + # 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="-lxml-security-c" + XMLSEC_LIBS="$XMLSEC_LIBS -lxml-security-c" # save and append master libs save_LIBS="$LIBS" @@ -188,23 +277,22 @@ if test x_$with_xmlsec != x_no; then 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_MSG_ERROR([unable to link with XML-Sec])]) + [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.])]) # restore master libs LIBS="$save_LIBS" - AC_LANG(C) - # libcurl settings AC_PATH_PROG(CURL_CONFIG,curl-config) AC_ARG_WITH(curl, @@ -236,58 +324,10 @@ int i = 0; # restore master libs LIBS="$save_LIBS" - # 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" - SSLLIBS="-L${with_openssl}/lib -lcrypto -lssl" - fi]) - - if test "x$SSLLIBS" = "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 - SSLLIBS="`$PKG_CONFIG --libs openssl`" - SSLFLAGS="`$PKG_CONFIG --cflags openssl`" - else - AC_MSG_ERROR([OpenSSL not supported by pkg-config, try --with-openssl instead]) - fi - fi - fi - - if test "x$SSLLIBS" = "x" ; then - SSLLIBS="-lcrypto -lssl" - fi - - AC_MSG_CHECKING(for OpenSSL cflags) - AC_MSG_RESULT($SSLFLAGS) - CPPFLAGS="$CPPFLAGS $SSLFLAGS" - AC_MSG_CHECKING(for OpenSSL libraries) - AC_MSG_RESULT($SSLLIBS) - XMLSEC_LIBS="$XMLSEC_LIBS $SSLLIBS" - - # save and append master libs - save_LIBS="$LIBS" - LIBS="$XMLSEC_LIBS $LIBS" - - 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_MSG_RESULT(yes) - - # restore master libs - LIBS="$save_LIBS" - AC_SUBST(XMLSEC_LIBS) - - AC_LANG(C++) else AC_MSG_WARN([xmlsec disabled, building without signature/encryption support]) - AC_DEFINE(XMLTOOLING_NO_XMLSEC,1, - [Define 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) @@ -295,8 +335,14 @@ AM_CONDITIONAL(BUILD_XMLSEC,test x_$with_xmlsec != x_no) 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.])], + [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.])], ) # Check for unit test support @@ -318,5 +364,7 @@ AM_CONDITIONAL(BUILD_UNITTEST,test -f ${CXXTEST}) LIBTOOL="$LIBTOOL --silent" -# output makefiles -AC_OUTPUT(Makefile xmltooling/Makefile xmltoolingtest/Makefile schemas/Makefile doc/Makefile) +# 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