X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=7e0d730117691cad3f4f048cbdc8559ed5e51976;hb=817e9a3c23f861c4eddaa50baed5de6ea991fa54;hp=c64aaf2d9629e122ab24f5b117c02b4413fd8b7e;hpb=a5e86d37cf40004e6a43a21ab67d26695fa8619c;p=shibboleth%2Fcpp-xmltooling.git diff --git a/configure.ac b/configure.ac index c64aaf2..7e0d730 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ AC_PREREQ([2.50]) -AC_INIT([xmltooling], [1.2], [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.2]) +AM_INIT_AUTOMAKE([xmltooling], [1.3]) sinclude(doxygen.m4) sinclude(acx_pthread.m4) @@ -92,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) @@ -112,7 +112,7 @@ if test -f "${LOG4SHIB_CONFIG}"; then [#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]) @@ -137,7 +137,7 @@ else [#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]) @@ -166,7 +166,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 +175,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 +196,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,7 +206,7 @@ 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])]) # XML-Security settings @@ -288,6 +288,7 @@ 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.])]) # restore master libs LIBS="$save_LIBS" @@ -319,6 +320,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 +328,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 +336,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.])], ) @@ -364,5 +365,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