From ad35fbf3a33185e40a55245326dc22dbd499c90b Mon Sep 17 00:00:00 2001 From: Francesco Giudici Date: Fri, 5 May 2017 12:18:51 +0200 Subject: [PATCH] build: restore --enable-concheck as default if libcurl is detected Recently we removed libsoup dependency in favor of libcurl. Connectivity checking functionality was enabled by defaut when libsoup was detected: do the same now when detecting libcurl. --- configure.ac | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 3832d20477..a3497a55fe 100644 --- a/configure.ac +++ b/configure.ac @@ -1037,11 +1037,14 @@ fi AM_CONDITIONAL(WITH_LIBPSL, test "$with_libpsl" != "no") +PKG_CHECK_MODULES(LIBCURL, [libcurl >= 7.24.0], [have_libcurl=yes], [have_libcurl=no]) AC_ARG_ENABLE(concheck, AS_HELP_STRING([--enable-concheck], [enable connectivity checking support]), - [enable_concheck=${enableval}], [enable_concheck=${with_libcurl}]) -if (test "${enable_concheck}" = "yes"); then - PKG_CHECK_MODULES(LIBCURL, [libcurl >= 7.24.0]) + [enable_concheck=${enableval}], [enable_concheck=${have_libcurl}]) +if test "${enable_concheck}" = "yes"; then + if test "$have_libcurl" != "yes"; then + AC_MSG_ERROR(Cannot find libcurl library required by concheck) + fi AC_DEFINE(WITH_CONCHECK, 1, [Define if you want connectivity checking support]) else enable_concheck=no