AC_PREREQ([2.50])
-AC_INIT([opensaml], [2.2.1], [mace-opensaml-users@internet2.edu], [saml])
+AC_INIT([opensaml], [2.4], [mace-opensaml-users@internet2.edu], [saml])
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([opensaml], [2.2.1])
+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)
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
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>
-#include <xmltooling/version.h>],
- [#if _XMLTOOLING_VERSION >= 10200
-xmltooling::XMLToolingConfig::getConfig();
-#else
-#error Need XMLTooling version 1.2 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])])
+ [#include <xmltooling/io/HTTPResponse.h>],
+ [xmltooling::HTTPResponse::sanitizeURL("http://test")],
+ [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"
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"