X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=a265891916b24958955788dd428d9f8b45441bbc;hb=98723acda4a57b5a164f658fe05c83f602fcd107;hp=5a645343e9dc80ed5cae54926a6fbde3239bb74e;hpb=df28107f61850f84b9479abf84ae01fa4bde91b5;p=shibboleth%2Fcpp-opensaml.git

diff --git a/configure.ac b/configure.ac
index 5a64534..a265891 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
 AC_PREREQ([2.50])
-AC_INIT([opensaml], [2.0], [mace-opensaml-users@internet2.edu], [saml])
+AC_INIT([opensaml], [2.4], [mace-opensaml-users@internet2.edu], [saml])
 AM_CONFIG_HEADER(config.h)
-#AM_CONFIG_HEADER(saml/config_pub.h)
-AM_INIT_AUTOMAKE([opensaml], [2.0])
+AM_INIT_AUTOMAKE([opensaml], [2.4])
 
 sinclude(doxygen.m4)
 sinclude(acx_pthread.m4)
+sinclude(ax_create_pkgconfig_info.m4)
 
 # Docygen features
 DX_HTML_FEATURE(ON)
@@ -104,7 +104,7 @@ if test "x$SSLFLAGS" = "x" ; then
         if pkg-config openssl ; then
             SSLFLAGS="`$PKG_CONFIG --cflags openssl`"
         else
-            AC_MSG_ERROR([OpenSSL not supported by pkg-config, try --with-openssl instead])
+            AC_MSG_WARN([OpenSSL not supported by pkg-config, try --with-openssl instead])
         fi
     fi
 fi
@@ -133,12 +133,13 @@ AC_ARG_WITH(log4shib,
     fi
     ])
 if test -f "${LOG4SHIB_CONFIG}"; then
-    LDFLAGS="`${LOG4SHIB_CONFIG} --libs` $LDFLAGS"
+    LIBS="`${LOG4SHIB_CONFIG} --libs` $LIBS"
     CPPFLAGS="`${LOG4SHIB_CONFIG} --cflags` $CPPFLAGS"
-	AC_CHECK_HEADER([log4shib/Category.hh],,AC_MSG_ERROR([unable to find log4shib header files]))
+	AC_CHECK_HEADER([log4shib/CategoryStream.hh],,AC_MSG_ERROR([unable to find log4shib header files]))
 	AC_TRY_LINK(
-		[#include <log4shib/Category.hh>],
-		[log4shib::Category::getInstance("foo")],
+		[#include <log4shib/Category.hh>
+#include <log4shib/CategoryStream.hh>],
+		[log4shib::Category::getInstance("foo").errorStream() << log4shib::eol],
 		[AC_DEFINE(OPENSAML_LOG4SHIB,1,[Define if log4shib library is used.])],
 		[AC_MSG_ERROR([unable to link with log4shib])])
 else
@@ -157,15 +158,15 @@ else
 	    ])
 	if test -f "${LOG4CPP_CONFIG}"; then
 		AC_MSG_WARN([will try to use log4cpp, note that most non-Internet2 supplied versions are not thread-safe])
-	    LDFLAGS="`${LOG4CPP_CONFIG} --libs` $LDFLAGS"
+	    LIBS="`${LOG4CPP_CONFIG} --libs` $LIBS"
 	    CPPFLAGS="`${LOG4CPP_CONFIG} --cflags` $CPPFLAGS"
-		AC_CHECK_HEADER([log4cpp/Category.hh],,AC_MSG_ERROR([unable to find log4cpp header files]))
-		AC_CHECK_HEADER([log4cpp/PropertyConfigurator.hh],,AC_MSG_ERROR([you need at least log4cpp 0.3.x]))
+		AC_CHECK_HEADER([log4cpp/CategoryStream.hh],,AC_MSG_ERROR([unable to find log4cpp header files]))
 		AC_TRY_LINK(
-			[#include <log4cpp/Category.hh>],
-			[log4cpp::Category::getInstance("foo")],
+			[#include <log4cpp/Category.hh>
+#include <log4cpp/CategoryStream.hh>],
+			[log4cpp::Category::getInstance("foo").errorStream() << log4cpp::eol],
 			[AC_DEFINE(OPENSAML_LOG4CPP,1,[Define if log4cpp library is used.])],
-			[AC_MSG_ERROR([unable to link with log4cpp])])
+			[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
@@ -196,6 +197,15 @@ AC_TRY_LINK(
     [AC_DEFINE(HAVE_LIBXERCESC,1,[Define if Xerces-C library was found])],
     [AC_MSG_ERROR([unable to link with Xerces])])
 
+AC_MSG_CHECKING([whether Xerces XMLString::release(XMLByte**) exists])
+AC_TRY_COMPILE([#include <xercesc/util/XMLString.hpp>],
+    [using namespace XERCES_CPP_NAMESPACE;
+      XMLByte* buf=NULL;
+      XMLString::release(&buf);
+    ],
+    [AC_MSG_RESULT([yes])]
+    [AC_DEFINE([OPENSAML_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,
@@ -233,20 +243,21 @@ AC_ARG_WITH(xmltooling,
     fi])
 LIBS="-lxmltooling $LIBS"
 AC_CHECK_HEADER([xmltooling/XMLToolingConfig.h],,AC_MSG_ERROR([unable to find xmltooling header files]))
-AC_TRY_LINK(
-    [#include <xmltooling/XMLToolingConfig.h>],
-    [xmltooling::XMLToolingConfig::getConfig().init()],
-    [AC_DEFINE(HAVE_LIBXMLTOOLING,1,[Define if XML-Tooling library was found])],
-    [AC_MSG_ERROR([unable to link with xmltooling library])]
-    )
 
-# Does the STL in use help or screw us?
 AC_TRY_LINK(
-    [#include <string>],
-    [std::basic_string<unsigned short> foo; foo=foo+(unsigned short)65],
-    [AC_DEFINE(HAVE_GOOD_STL,1,
-        [Define if you have an STL implementation that supports useful string specialization.])],
-    )
+	[
+#include <xmltooling/XMLToolingConfig.h>
+#include <xmltooling/version.h>
+	],
+	[
+#if _XMLTOOLING_VERSION >= 10400
+xmltooling::XMLToolingConfig::getConfig();
+#else
+#error Need XMLTooling version 1.4 or higher
+#endif
+	],
+    [AC_DEFINE(HAVE_XMLTOOLING,1,[Define if xmltooling library was found])],
+    [AC_MSG_ERROR([unable to link with XMLTooling, or version was too old])])
 
 # Check for unit test support
 CXXTEST="/usr/bin/cxxtestgen.pl"
@@ -265,8 +276,12 @@ AC_SUBST(CXXTEST)
 AC_SUBST(CXXTESTFLAGS)
 AM_CONDITIONAL(BUILD_UNITTEST,test -f ${CXXTEST})
 
+AX_CREATE_PKGCONFIG_INFO(,,[$LIBS -lsaml],[OpenSAML library])
+
 AC_SUBST(DX_INCLUDE)
 LIBTOOL="$LIBTOOL --silent"
 
-# output makefiles
-AC_OUTPUT(Makefile saml/Makefile samltest/Makefile samlsign/Makefile schemas/Makefile doc/Makefile)
+# output packaging and makefiles
+AC_CONFIG_FILES([opensaml.spec pkginfo Portfile])
+AC_CONFIG_FILES([Makefile saml/Makefile samltest/Makefile samlsign/Makefile schemas/Makefile doc/Makefile])
+AC_OUTPUT