Add legacy option for fallback to OrgDisplayName, use UTF-8 for names.

[shibboleth/cpp-opensaml.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 4859844..8393bef 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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