From faa1b85dab647baad7ce856e83f343af841aa6a5 Mon Sep 17 00:00:00 2001 From: Francesco Giudici Date: Tue, 9 May 2017 19:21:24 +0200 Subject: [PATCH] build: set --enable-conckeck as default connectivity check functionality should be explicitly set as disabled if not wanted: this prevents building NM without connectivity check support without any evident warning on systems where libcurl is not installed. (cherry picked from commit 4e6967e33d912511f38b347c061cecb2ac4421fc) --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index d82fc63298..fd78f3df09 100644 --- a/configure.ac +++ b/configure.ac @@ -973,13 +973,13 @@ else 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=${have_libcurl}]) + [enable_concheck=${enableval}], [enable_concheck=yes]) if test "${enable_concheck}" = "yes"; then + PKG_CHECK_MODULES(LIBCURL, [libcurl >= 7.24.0], [have_libcurl=yes], [have_libcurl=no]) if test "$have_libcurl" != "yes"; then - AC_MSG_ERROR(Cannot find libcurl library required by concheck) + AC_MSG_ERROR(--enable-concheck requires libcurl library.) fi AC_DEFINE(WITH_CONCHECK, 1, [Define if you want connectivity checking support]) else