X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=76e8787ad00b072dd0d944dddfe00a1a708b52cb;hb=12da3c24eee84c65a560fa51ae719d52875469da;hp=1da02e366e46a0ef9aaaa478bbe905ac27f2e7cb;hpb=885493086e4423d6e387049cc97fcdfb9332d765;p=shibboleth%2Fcpp-opensaml.git

diff --git a/configure.ac b/configure.ac
index 1da02e3..76e8787 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,11 @@
 AC_PREREQ([2.50])
-AC_INIT([opensaml],[2.4],[https://bugs.internet2.edu/],[saml])
+AC_INIT([opensaml],[2.5],[https://issues.shibboleth.net/],[opensaml])
 AC_CONFIG_SRCDIR(saml)
 AC_CONFIG_AUX_DIR(build-aux)
 AC_CONFIG_MACRO_DIR(m4)
 AM_INIT_AUTOMAKE
-LT_INIT
+AC_DISABLE_STATIC
+AC_PROG_LIBTOOL
 
 # Docygen features
 DX_HTML_FEATURE(ON)
@@ -19,7 +20,7 @@ DX_INIT_DOXYGEN(opensaml, doxygen.cfg, doc/api)
 DX_INCLUDE=
 
 AC_ARG_ENABLE(debug,
-    AC_HELP_STRING(--enable-debug, [Have GCC compile with symbols (Default = no)]),
+    AS_HELP_STRING([--enable-debug],[Have GCC compile with symbols (Default = no)]),
     enable_debug=$enableval, enable_debug=no)
 
 if test "$enable_debug" = "yes" ; then
@@ -31,12 +32,11 @@ else
 fi
 
 AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_FILES([opensaml.spec pkginfo Portfile])
+AC_CONFIG_FILES([opensaml.spec])
 AC_CONFIG_FILES([Makefile saml/Makefile samltest/Makefile samlsign/Makefile schemas/Makefile doc/Makefile])
 
 AC_PROG_CC([gcc gcc3 cc])
 AC_PROG_CXX([g++ g++3 c++ CC])
-AC_DISABLE_STATIC
 AC_CANONICAL_HOST
 
 if test "$GCC" = "yes" ; then
@@ -237,18 +237,14 @@ AC_ARG_WITH(xmltooling,
 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 >= 10400
+AC_LINK_IFELSE(
+    [AC_LANG_PROGRAM([[#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
-	],
+#endif]])],
     ,[AC_MSG_ERROR([unable to link with XMLTooling, or version was too old])])
 
 # Check for unit test support