fix --with-libcurl and --with-libgnurl options; they used to

ignore the given path.
This commit is contained in:
Marcello Stanisci 2017-10-18 09:39:37 +02:00
parent 58528f32dd
commit ae68bd7cfe
No known key found for this signature in database
GPG Key ID: 8D526861953F4C0F

View File

@ -317,6 +317,8 @@ AM_CONDITIONAL(HAVE_POSTGRESQL, test x$postgres = xtrue)
LIBGNURL_CHECK_CONFIG(,7.34.0,gnurl=1,gnurl=0) LIBGNURL_CHECK_CONFIG(,7.34.0,gnurl=1,gnurl=0)
if test "$gnurl" = 1 if test "$gnurl" = 1
then then
LDFLAGS="-L$with_libgnurl/lib $LDFLAGS"
CPPFLAGS="-I$with_libgnurl/include $CPPFLAGS"
AM_CONDITIONAL(HAVE_LIBGNURL, [true]) AM_CONDITIONAL(HAVE_LIBGNURL, [true])
AC_DEFINE([HAVE_LIBGNURL],[1],[Have libgnurl]) AC_DEFINE([HAVE_LIBGNURL],[1],[Have libgnurl])
else else
@ -327,6 +329,8 @@ fi
LIBCURL_CHECK_CONFIG(,7.34.0,[curl=true],[curl=false]) LIBCURL_CHECK_CONFIG(,7.34.0,[curl=true],[curl=false])
if test "x$curl" = xtrue if test "x$curl" = xtrue
then then
LDFLAGS="-L$with_libcurl/lib $LDFLAGS"
CPPFLAGS="-I$with_libcurl/include $CPPFLAGS"
AC_CHECK_HEADERS([curl/curl.h], AC_CHECK_HEADERS([curl/curl.h],
AC_CHECK_DECLS(CURLINFO_TLS_SESSION,[curl=true],[curl=false],[[#include <curl/curl.h>]]), AC_CHECK_DECLS(CURLINFO_TLS_SESSION,[curl=true],[curl=false],[[#include <curl/curl.h>]]),
[curl=false]) [curl=false])