X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=e32ed01f7f8b1d33d042ed853bdc1b07e859ce6b;hb=30bfd5d86c9a82e62544296e5e5925e8ead3507d;hp=4859844acb60bf22e3dbf5f59fff9eab23d07606;hpb=6351b161a09c74f9302912c705681657d15c39a4;p=shibboleth%2Fcpp-opensaml.git

diff --git a/configure.ac b/configure.ac
index 4859844..e32ed01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,8 @@ 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)
@@ -36,7 +37,6 @@ AC_CONFIG_FILES([Makefile saml/Makefile samltest/Makefile samlsign/Makefile sche
 
 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