X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=0c4a89815c8094753f2819039fe84c9ae1ff1a05;hb=aad3cc122bf1227d27418b072c9bf91a47152fe6;hp=c64aaf2d9629e122ab24f5b117c02b4413fd8b7e;hpb=a5e86d37cf40004e6a43a21ab67d26695fa8619c;p=shibboleth%2Fcpp-xmltooling.git diff --git a/configure.ac b/configure.ac index c64aaf2..0c4a898 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_PREREQ([2.50]) -AC_INIT([xmltooling], [1.2], [mace-opensaml-users@internet2.edu], [xmltooling]) -AM_CONFIG_HEADER(config.h) -AM_CONFIG_HEADER(xmltooling/config_pub.h) -AM_INIT_AUTOMAKE([xmltooling], [1.2]) - -sinclude(doxygen.m4) -sinclude(acx_pthread.m4) +# Process this file with autoreconf +AC_PREREQ([2.60]) +AC_INIT([xmltooling],[1.4],[https://bugs.internet2.edu/],[xmltooling]) +AC_CONFIG_SRCDIR(xmltooling) +AC_CONFIG_AUX_DIR(build-aux) +AC_CONFIG_MACRO_DIR(m4) +AM_INIT_AUTOMAKE +LT_INIT # Docygen features DX_HTML_FEATURE(ON) @@ -19,7 +19,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 @@ -30,8 +30,13 @@ else GCC_CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG" fi +AC_CONFIG_HEADERS([config.h xmltooling/config_pub.h]) +AC_CONFIG_FILES([xmltooling.spec pkginfo Portfile]) +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_DISABLE_STATIC AC_CANONICAL_HOST if test "$GCC" = "yes" ; then @@ -55,9 +60,6 @@ else esac fi -AC_DISABLE_STATIC -AC_PROG_LIBTOOL - # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST AC_TYPE_SIZE_T @@ -73,7 +75,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" @@ -89,15 +91,28 @@ AC_CXX_REQUIRE_STL AC_CXX_NAMESPACES # are covariant methods allowed? -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_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.])] + ) + +# 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.])] + ) # 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 @@ -105,14 +120,14 @@ 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(XMLTOOLING_LOG4SHIB,1,[Define if log4shib library is used.])], + [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]) @@ -121,7 +136,7 @@ else # log4cpp settings AC_PATH_PROG(LOG4CPP_CONFIG,log4cpp-config) AC_ARG_WITH(log4cpp, - AC_HELP_STRING([--with-log4cpp=PATH], [where log4cpp-config is installed]), + AS_HELP_STRING([--with-log4cpp=PATH], [where log4cpp-config is installed]), [ LOG4CPP_CONFIG="${with_log4cpp}" if ! test -f "${LOG4CPP_CONFIG}" ; then @@ -130,14 +145,14 @@ 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(XMLTOOLING_LOG4CPP,1,[Define if log4cpp library is used.])], + [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]) @@ -146,7 +161,7 @@ fi # Xerces settings AC_ARG_WITH(xerces, - AC_HELP_STRING([--with-xerces=PATH], [where xerces-c is installed]), + AS_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" @@ -166,7 +181,7 @@ 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]) @@ -175,18 +190,18 @@ AC_TRY_COMPILE([#include ], XMLFilePos testvar; ], [AC_MSG_RESULT([yes])] - [AC_DEFINE(XMLTOOLING_XERCESC_64BITSAFE)], + [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 ], +AC_TRY_COMPILE([#include ], [using namespace XERCES_CPP_NAMESPACE; - char buf[1024]; + XMLByte buf[1024]; BinMemInputStream in(buf,1024); in.getContentType(); ], [AC_MSG_RESULT([yes])] - [AC_DEFINE(XMLTOOLING_XERCESC_INPUTSTREAM_HAS_CONTENTTYPE)], + [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]) @@ -196,7 +211,7 @@ AC_TRY_COMPILE([#include ], DOMLSSerializer *ls = ((DOMImplementationLS*)impl)->createLSSerializer(); ], [AC_MSG_RESULT([yes])] - [AC_DEFINE(XMLTOOLING_XERCESC_COMPLIANT_DOMLS)], + [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)]) @@ -206,19 +221,29 @@ AC_TRY_COMPILE([#include ], elt->setIdAttribute(NULL, false); ], [AC_MSG_RESULT([yes])] - [AC_DEFINE(XMLTOOLING_XERCESC_BOOLSETIDATTRIBUTE)], + [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_MSG_RESULT([no])]) + # XML-Security settings AC_ARG_WITH(xmlsec, - AC_HELP_STRING([--with-xmlsec=PATH], [where xmlsec is installed]),, + 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" @@ -233,7 +258,7 @@ if test x_$with_xmlsec != x_no; 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]) + AC_MSG_WARN([OpenSSL not supported by pkg-config, try --with-openssl instead]) fi fi fi @@ -260,6 +285,10 @@ if test x_$with_xmlsec != x_no; then AC_MSG_ERROR([unable to link with openssl libraries])) AC_MSG_RESULT(yes) + AC_CHECK_DECL(EVP_sha512, + [AC_DEFINE([XMLTOOLING_OPENSSL_HAVE_SHA2],[],[Define to 1 if OpenSSL supports the SHA-2 hash family.])], + ,[#include ]) + # restore master libs LIBS="$save_LIBS" @@ -288,6 +317,35 @@ int i = 0; [#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_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])]) + + AC_MSG_CHECKING([whether XML-Security-C includes ECC support]) + AC_TRY_COMPILE([#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 debug logging support]) + AC_TRY_COMPILE([#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" @@ -295,7 +353,7 @@ int i = 0; # libcurl settings AC_PATH_PROG(CURL_CONFIG,curl-config) AC_ARG_WITH(curl, - AC_HELP_STRING([--with-curl=PATH], [where curl-config is installed]), + AS_HELP_STRING([--with-curl=PATH], [where curl-config is installed]), [ CURL_CONFIG="${with_curl}" if ! test -f "${CURL_CONFIG}" ; then @@ -319,6 +377,7 @@ int i = 0; 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" @@ -326,8 +385,7 @@ int i = 0; AC_SUBST(XMLSEC_LIBS) 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) @@ -335,13 +393,13 @@ 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, + [AC_DEFINE([HAVE_ITERATOR_TRAITS], [1], [Define to 1 if you have an STL implementation that supports std::iterator_traits.])], ) @@ -349,7 +407,7 @@ AC_TRY_LINK( CXXTEST="/usr/bin/cxxtestgen.pl" CXXTESTFLAGS="" AC_ARG_WITH(cxxtest, - AC_HELP_STRING([--with-cxxtest=PATH], [where cxxtest is installed]), + 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}" @@ -362,7 +420,9 @@ AC_SUBST(CXXTEST) AC_SUBST(CXXTESTFLAGS) AM_CONDITIONAL(BUILD_UNITTEST,test -f ${CXXTEST}) +AX_CREATE_PKGCONFIG_INFO(,,[$XMLSEC_LIBS -lxmltooling],[OpenSAML XMLTooling-C library]) + LIBTOOL="$LIBTOOL --silent" -# output makefiles -AC_OUTPUT(Makefile xmltooling/Makefile xmltoolingtest/Makefile schemas/Makefile doc/Makefile) +# output packaging and makefiles +AC_OUTPUT