[shibboleth-sp2] 67/100: Checking for Xerces 2.6.0

[Ferenc Wágner]

This is an automated email from the git hooks/post-receive script.

wferi-guest pushed a commit to annotated tag 1.2.1
in repository shibboleth-sp2.

commit 194c43c4ba1c9a2d2c5926297686162e3e778216
Author: Scott Cantor <cantor.2 at osu.edu>
Date:   Thu Oct 21 20:03:50 2004 +0000

    Checking for Xerces 2.6.0
---
 configure.ac | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index bd9f055..4737f43 100644
--- a/configure.ac
+++ b/configure.ac
@@ -183,16 +183,22 @@ AC_ARG_WITH(xerces,
 LIBS="-lxerces-c $LIBS"
 AC_CHECK_HEADER([xercesc/dom/DOM.hpp],,
                 AC_MSG_ERROR([unable to find xerces header files]))
-AC_TRY_LINK(
-	[#include <xercesc/util/PlatformUtils.hpp>
-#include <xercesc/util/XercesVersion.hpp>],
-        [#if _XERCES_VERSION >= 20300
-xercesc::XMLPlatformUtils::Initialize();
+AC_MSG_CHECKING([Xerces version])
+AC_PREPROC_IFELSE(
+        [AC_LANG_PROGRAM([#include <xercesc/util/XercesVersion.hpp>],
+[#if  _XERCES_VERSION != 20600 && _XERCES_VERSION >= 20300
+int i = 0;
 #else
-#error Need Xerces-C version 2.3+ only
-#endif],
-	[AC_DEFINE(HAVE_LIBXERCESC,1,[Define if Xerces-C library was found])],
-	[AC_MSG_ERROR([unable to link with Xerces])])
+#error cannot use version = 2.6.0 or < 2.3.0
+#endif])],
+        [AC_MSG_RESULT(OK)],
+        [AC_MSG_FAILURE([Shibboleth requires a Xerces version > 2.3.0, but cannot use 2.6.0 -- a 2.6.1 patched release is available from us])])
+AC_TRY_LINK(
+        [#include <xercesc/util/PlatformUtils.hpp>],
+        [xercesc::XMLPlatformUtils::Initialize()],
+        [AC_DEFINE(HAVE_LIBXERCESC,1,[Define if Xerces-C library was found])],
+        [AC_MSG_ERROR([unable to link with Xerces])])
+
 
 # XML-Security settings
 AC_ARG_WITH(xmlsec,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git