diff options
| author | Francesco Giudici <fgiudici@redhat.com> | 2017-05-05 12:18:51 +0200 |
|---|---|---|
| committer | Francesco Giudici <fgiudici@redhat.com> | 2017-05-05 12:39:43 +0200 |
| commit | ad35fbf3a33185e40a55245326dc22dbd499c90b (patch) | |
| tree | 17cf909488f361c49b887274cb43587bc4ca36e9 | |
| parent | 378cbca6f7cedec3ed8ac978feccec267f0f7069 (diff) | |
| download | NetworkManager-ad35fbf3a33185e40a55245326dc22dbd499c90b.tar.gz | |
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.
| -rw-r--r-- | configure.ac | 9 |
1 files 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 |