diff options
| author | Francesco Giudici <fgiudici@redhat.com> | 2017-05-09 19:21:24 +0200 |
|---|---|---|
| committer | Francesco Giudici <fgiudici@redhat.com> | 2017-05-10 09:11:48 +0200 |
| commit | 4e6967e33d912511f38b347c061cecb2ac4421fc (patch) | |
| tree | ab5c27684134b36904813ccde877b5dae4261dac | |
| parent | b6b7d909f7023ef1830fe5a072b64e109397f609 (diff) | |
| download | NetworkManager-4e6967e33d912511f38b347c061cecb2ac4421fc.tar.gz | |
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.
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index f4f347cff0..f80f2c0707 100644 --- a/configure.ac +++ b/configure.ac @@ -1037,13 +1037,13 @@ 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 |