|
@@ -461,18 +461,35 @@ else
|
|
|
AM_CONDITIONAL(HAVE_LIBGNURL, false)
|
|
|
fi
|
|
|
|
|
|
+SAVE_CPPFLAGS=$CPPFLAGS
|
|
|
+CPPFLAGS="$LIBGNURL_CPPFLAGS $LIBCURL_CPPFLAGS $CPPFLAGS"
|
|
|
+LIBS="$LIBGNURL $LIBCURL $LIBS"
|
|
|
+
|
|
|
# libcurl-gnutls
|
|
|
LIBCURL_CHECK_CONFIG(,7.34.0,[curl=true],[curl=false])
|
|
|
if test "x$curl" = xtrue
|
|
|
then
|
|
|
+
|
|
|
AC_CHECK_HEADERS([curl/curl.h],
|
|
|
- AC_CHECK_DECLS(CURLINFO_TLS_SESSION,[curl=true],[curl=false],[[#include <curl/curl.h>]]),
|
|
|
- [curl=false])
|
|
|
+ AC_CHECK_DECLS(CURLINFO_TLS_SESSION,[curl=true],[curl=false],[[#include <curl/curl.h>]]),
|
|
|
+ [curl=false])
|
|
|
+ AC_CHECK_HEADERS([gnurl/curl.h],
|
|
|
+ AC_CHECK_DECLS(CURLINFO_TLS_SESSION,[curl=true],,[[#include <gnurl/curl.h>]]))
|
|
|
# need libcurl-gnutls.so, everything else is not acceptable
|
|
|
AC_CHECK_LIB([curl-gnutls],[curl_easy_getinfo],,[curl=false])
|
|
|
# cURL must support CURLINFO_TLS_SESSION, version >= 7.34
|
|
|
-
|
|
|
fi
|
|
|
+
|
|
|
+# Check for curl/curl.h and gnurl/curl.h so we can use #ifdef
|
|
|
+# HAVE_CURL_CURL_H later (the above LIBCURL_CHECK_CONFIG accepted
|
|
|
+# *either* header set).
|
|
|
+AC_CHECK_HEADERS([curl/curl.h],,
|
|
|
+ curl=false
|
|
|
+ AC_CHECK_HEADERS([gnurl/curl.h],,
|
|
|
+ gnurl=false))
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
if test x$curl = xfalse
|
|
|
then
|
|
|
AM_CONDITIONAL(HAVE_LIBCURL, false)
|
|
@@ -486,10 +503,9 @@ else
|
|
|
fi
|
|
|
|
|
|
|
|
|
-
|
|
|
-# restore LIBS
|
|
|
+# restore LIBS & CPPFLAGS
|
|
|
LIBS=$SAVE_LIBS
|
|
|
-
|
|
|
+CPPFLAGS=$SAVE_CPPFLAGS
|
|
|
|
|
|
AC_CHECK_HEADERS([glpk.h],[glpk=true],[gplk=false])
|
|
|
# GLPK must support glpk_init_env, version >= 4.43
|
|
@@ -1641,9 +1657,9 @@ then
|
|
|
fi
|
|
|
|
|
|
# libgnurl
|
|
|
-if test "x$gnurl" = "x0"
|
|
|
+if test "x$gnurl" = "xfalse"
|
|
|
then
|
|
|
- if test "x$curl" = "x0"
|
|
|
+ if test "x$curl" = "xfalse"
|
|
|
then
|
|
|
AC_MSG_NOTICE([NOTICE: libgnurl not found. http client support will not be compiled.])
|
|
|
AC_MSG_WARN([ERROR: libgnurl not found. hostlist daemon will not be compiled, and you probably WANT the hostlist daemon])
|