fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 19:28:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: restore --enable-concheck as default if libcurl is detected

Browse source 
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.

(cherry picked from commit ad35fbf3a3)
This commit is contained in:
Francesco Giudici 2017-05-05 12:18:51 +02:00
parent 227bc5ed27
commit 170e6b7772
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
configure.ac
View file

@ -973,10 +973,14 @@ else
fi
AM_CONDITIONAL(WITH_LIBPSL, test "$with_libpsl" != "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])
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}])
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