From: Scott Cantor Date: Tue, 12 Oct 2010 15:58:26 +0000 (+0000) Subject: Result of autoupdate X-Git-Tag: 1.4RC1~14 X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-xmltooling.git;a=commitdiff_plain;h=758ca4437f77768ba4f486ddb944c8b597255ba3 Result of autoupdate --- diff --git a/configure.ac b/configure.ac index 0c4a898..bd6dbe0 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ # Process this file with autoreconf -AC_PREREQ([2.60]) +AC_PREREQ([2.67]) AC_INIT([xmltooling],[1.4],[https://bugs.internet2.edu/],[xmltooling]) AC_CONFIG_SRCDIR(xmltooling) AC_CONFIG_AUX_DIR(build-aux) @@ -123,12 +123,8 @@ if test -f "${LOG4SHIB_CONFIG}"; then 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 to 1 if log4shib library is used.])], - [AC_MSG_ERROR([unable to link with log4shib])]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#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]) AC_MSG_WARN([will look for original log4cpp library]) @@ -148,12 +144,8 @@ else 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 to 1 if log4cpp library is used.])], - [AC_MSG_ERROR([unable to link with log4cpp, need version 1.0 or later])]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#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 @@ -178,61 +170,42 @@ int i = 0; #endif])], [AC_MSG_RESULT(OK)], [AC_MSG_FAILURE([Xerces-C v2.6.0 has bugs that inhibit use with signed XML, please use a newer version])]) -AC_TRY_LINK( - [#include ], - [xercesc::XMLPlatformUtils::Initialize()], - [AC_DEFINE([HAVE_LIBXERCESC], [1], [Define to 1 if Xerces-C library was found])], - [AC_MSG_ERROR([unable to link with Xerces])]) +AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[xercesc::XMLPlatformUtils::Initialize()]])],[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; +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#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_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; +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#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_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; +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#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_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; +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#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])]) + ]])],[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])]) AC_MSG_CHECKING([whether Xerces XMLString::release(XMLByte**) exists]) -AC_TRY_COMPILE([#include ], - [using namespace XERCES_CPP_NAMESPACE; +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#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])]) + ]])],[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, @@ -313,39 +286,24 @@ int i = 0; #endif])], [AC_MSG_RESULT(OK)], [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-Security])]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#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_COMPILE_IFELSE([AC_LANG_PROGRAM([[#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_COMPILE_IFELSE([AC_LANG_PROGRAM([[#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_COMPILE_IFELSE([AC_LANG_PROGRAM([[#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])]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#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" @@ -390,18 +348,10 @@ fi AM_CONDITIONAL(BUILD_XMLSEC,test x_$with_xmlsec != x_no) # 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 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.])], - ) +AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[std::basic_string foo; foo=foo+(unsigned short)65]])],[AC_DEFINE([HAVE_GOOD_STL], [1], + [Define to 1 if you have an STL implementation that supports useful string specialization.])],[]) +AC_LINK_IFELSE([AC_LANG_PROGRAM([[#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 CXXTEST="/usr/bin/cxxtestgen.pl" diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 index 15cc47f..79a124b 100644 --- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -8,12 +8,12 @@ dnl AC_DEFUN([AC_CXX_NAMESPACES], [AC_CACHE_CHECK(whether the compiler implements namespaces, ac_cv_cxx_namespaces, -[AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_TRY_COMPILE([namespace Outer { namespace Inner { int i = 0; }}], - [using namespace Outer::Inner; return i;], - ac_cv_cxx_namespaces=yes, ac_cv_cxx_namespaces=no) - AC_LANG_RESTORE +[AC_DIAGNOSE([obsolete],[Instead of using `AC_LANG', `AC_LANG_SAVE', and `AC_LANG_RESTORE', +you should use `AC_LANG_PUSH' and `AC_LANG_POP'.])dnl +AC_LANG_SAVE + AC_LANG([C++]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[namespace Outer { namespace Inner { int i = 0; }}]], [[using namespace Outer::Inner; return i;]])],[ac_cv_cxx_namespaces=yes],[ac_cv_cxx_namespaces=no]) + AC_LANG_POP([]) ]) if test "$ac_cv_cxx_namespaces" = yes; then AC_DEFINE(HAVE_NAMESPACES,1,[define if the compiler implements namespaces]) @@ -28,16 +28,17 @@ AC_DEFUN([AC_CXX_REQUIRE_STL], [AC_CACHE_CHECK(whether the compiler supports Standard Template Library, ac_cv_cxx_have_stl, [AC_REQUIRE([AC_CXX_NAMESPACES]) - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_TRY_COMPILE([#include + AC_DIAGNOSE([obsolete],[Instead of using `AC_LANG', `AC_LANG_SAVE', and `AC_LANG_RESTORE', +you should use `AC_LANG_PUSH' and `AC_LANG_POP'.])dnl +AC_LANG_SAVE + AC_LANG([C++]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include #include #ifdef HAVE_NAMESPACES using namespace std; -#endif],[list x; x.push_back(5); -list::iterator iter = x.begin(); if (iter != x.end()) ++iter; return 0;], - ac_cv_cxx_have_stl=yes, ac_cv_cxx_have_stl=no) - AC_LANG_RESTORE +#endif]], [[list x; x.push_back(5); +list::iterator iter = x.begin(); if (iter != x.end()) ++iter; return 0;]])],[ac_cv_cxx_have_stl=yes],[ac_cv_cxx_have_stl=no]) + AC_LANG_POP([]) ]) if test "x_$ac_cv_cxx_have_stl" != x_yes; then AC_MSG_ERROR([C++ Standard Template Libary unsupported]) diff --git a/m4/doxygen.m4 b/m4/doxygen.m4 index 9bda4f6..20f68f2 100644 --- a/m4/doxygen.m4 +++ b/m4/doxygen.m4 @@ -52,7 +52,7 @@ AC_DEFUN([DX_FEATURE_pdf], ON) AC_DEFUN([DX_FEATURE_ps], ON) # Compatibility with older autoconf versions. -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) +m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AS_HELP_STRING]))]) ## --------------- ## ## Private macros. ##