Reorder libtool macros.

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

diff --git a/configure.ac b/configure.ac
index fe13c52..596484c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -56,8 +56,8 @@ else
        esac
 fi
 
-AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
+AC_DISABLE_STATIC
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -133,7 +133,7 @@ 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/CategoryStream.hh],,AC_MSG_ERROR([unable to find log4shib header files]))
        AC_TRY_LINK(
@@ -158,7 +158,7 @@ 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/CategoryStream.hh],,AC_MSG_ERROR([unable to find log4cpp header files]))
                AC_TRY_LINK(
@@ -243,9 +243,19 @@ 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/io/HTTPResponse.h>],
-    [xmltooling::HTTPResponse::sanitizeURL("http://test")],
+       [
+#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])])
 
@@ -266,7 +276,7 @@ AC_SUBST(CXXTEST)
 AC_SUBST(CXXTESTFLAGS)
 AM_CONDITIONAL(BUILD_UNITTEST,test -f ${CXXTEST})
 
-AX_CREATE_PKGCONFIG_INFO
+AX_CREATE_PKGCONFIG_INFO(,,[$LIBS -lsaml],[OpenSAML library])
 
 AC_SUBST(DX_INCLUDE)
 LIBTOOL="$LIBTOOL --silent"