Updated version

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

diff --git a/configure.ac b/configure.ac
index 08acc61..4713545 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
 dnl $Id$ 
 
 AC_PREREQ([2.50])
-AC_INIT([shibboleth], [0.8], [mace-shib-users@internet2.edu], [shibboleth])
+AC_INIT([shibboleth], [1.0], [mace-shib-users@internet2.edu], [shibboleth])
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(shibboleth, 0.8)
+AM_INIT_AUTOMAKE(shibboleth, 1.0)
 
 sinclude(acx_pthread.m4)
 sinclude(acx_rpctest.m4)
@@ -84,9 +84,9 @@ AC_ARG_WITH(log4cpp,
 
 AC_ARG_WITH(xmlsec,
             AC_HELP_STRING([--with-xmlsec=PATH], [where xmlsec is installed]),
-            [if test -f "${with_xmlsec}/bin/xmlsec-config"; then
-                LDFLAGS="`${with_xmlsec}/bin/xmlsec-config --libs` $LDFLAGS"
-                CPPFLAGS="`${with_xmlsec}/bin/xmlsec-config --cflags` $CPPFLAGS"
+            [if test x_$with_xmlsec != x_/usr; then
+                LDFLAGS="-L${with_xmlsec}/lib $LDFLAGS"
+                CPPFLAGS="-I${with_xmlsec}/include $CPPFLAGS"
             fi])
 
 AC_ARG_WITH(saml,
@@ -108,6 +108,18 @@ AC_TRY_LINK(
                LIBS="$saved_LIBS"
        ])
 
+AC_CHECK_HEADER([xsec/utils/XSECPlatformUtils.hpp],,
+                AC_MSG_ERROR([unable to find xsec header files]))
+saved_LIBS="$LIBS"
+LIBS="-lxml-security-c $LIBS"
+AC_TRY_LINK(
+        [#include <xsec/utils/XSECPlatformUtils.hpp>],
+        [XSECPlatformUtils::Initialise()],
+        [AC_DEFINE(HAVE_LIBXSEC,1,[Define if XML-Sec library was found])],
+        [AC_MSG_ERROR([unable to link with XML-Sec])
+                LIBS="$saved_LIBS"
+        ])
+
 AC_CHECK_HEADER([openssl/ssl.h],,
                 AC_MSG_ERROR([unable to find openssl header files]))
 AC_CHECK_LIB([crypto], [ERR_load_CRYPTO_strings],,
@@ -115,16 +127,6 @@ AC_CHECK_LIB([crypto], [ERR_load_CRYPTO_strings],,
 AC_CHECK_LIB([ssl], [SSL_library_init],, 
              AC_MSG_ERROR([unable to link with openssl libraries]))
 
-AC_CHECK_HEADER([libxml/parser.h],,
-                AC_MSG_ERROR([unable to find libxml2 header files]))
-AC_CHECK_LIB([xml2], [xmlInitParser],echo "foo" > /dev/null,
-             AC_MSG_ERROR([unable to link with libxml2]))
-
-AC_CHECK_HEADER([xmlsec/xmlsec.h],,
-                AC_MSG_ERROR([unable to find xmlsec header files]))
-AC_CHECK_LIB([xmlsec], [xmlSecInit],echo "foo" > /dev/null,
-             AC_MSG_ERROR([unable to link with xmlsec]), [-lxml2])
-
 AC_CHECK_HEADER([log4cpp/Category.hh],,
                 AC_MSG_ERROR([unable to find log4cpp header files]))
 

diff --git a/shib-target/Makefile.am b/shib-target/Makefile.am
index 1f59d74..e322471 100644 (file)
--- a/shib-target/Makefile.am
+++ b/shib-target/Makefile.am
@@ -34,10 +34,7 @@ libshib_target_la_SOURCES = \
 
 # this is different from the project version
 # http://sources.redhat.com/autobook/autobook/autobook_91.html
-libshib_target_la_LDFLAGS = -version-info 2:0:0
-
-
-
+libshib_target_la_LDFLAGS = -version-info 3:0:0
 
 
 

diff --git a/shib/Makefile.am b/shib/Makefile.am
index bdde0ca..6c4698f 100644 (file)
--- a/shib/Makefile.am
+++ b/shib/Makefile.am
@@ -26,5 +26,5 @@ libshib_la_SOURCES = \
 
 # this is different from the project version
 # http://sources.redhat.com/autobook/autobook/autobook_91.html
-libshib_la_LDFLAGS = -version-info 2:0:0
+libshib_la_LDFLAGS = -version-info 3:0:0