From: cantor <cantor@cb58f699-b61c-0410-a6fe-9272a202ed29>
Date: Mon, 24 Jan 2005 03:44:33 +0000 (+0000)
Subject: Corrected Xerces and XMLSec tests
X-Git-Tag: 2.4~1682
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fsp.git;a=commitdiff_plain;h=274a48f4cb5db384d992e6c5e5232f7abc9a9a52

Corrected Xerces and XMLSec tests


git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@1320 cb58f699-b61c-0410-a6fe-9272a202ed29
---

diff --git a/configure.ac b/configure.ac
index 1249d9d..8cb5521 100644
--- a/configure.ac
+++ b/configure.ac
@@ -186,7 +186,7 @@ AC_CHECK_HEADER([xercesc/dom/DOM.hpp],,
 AC_MSG_CHECKING([Xerces version])
 AC_PREPROC_IFELSE(
         [AC_LANG_PROGRAM([#include <xercesc/util/XercesVersion.hpp>],
-[#if  _XERCES_VERSION != 20601
+[#if  _XERCES_VERSION == 20601
 int i = 0;
 #else
 #error must use patched version 2.6.1 provided by Shibboleth project (http://wayf.internet2.edu/shibboleth/)
@@ -208,7 +208,7 @@ AC_ARG_WITH(xmlsec,
                 CPPFLAGS="-I${with_xmlsec}/include $CPPFLAGS"
             fi])
 LIBS="-lxml-security-c $LIBS"
-AC_CHECK_HEADER([xsec/xenc/XENCEncryptionMethod.hpp],,AC_MSG_ERROR([unable to find xml-security 1.1 header files]))
+AC_CHECK_HEADER([xsec/xenc/XENCEncryptionMethod.hpp],,AC_MSG_ERROR([unable to find xml-security 1.1 header files]),[#include <xercesc/dom/DOM.hpp>])
 AC_TRY_LINK(
         [#include <xsec/utils/XSECPlatformUtils.hpp>],
         [XSECPlatformUtils::Initialise()],