diff options
| author | Thomas Haller <thaller@redhat.com> | 2023-05-11 14:26:35 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2023-05-11 14:26:35 +0200 |
| commit | b3db68a87ddda477a9f85790889401a1a37f16b0 (patch) | |
| tree | 58a70942560ff941da98c82da39839e33aef4a57 | |
| parent | ae5147915804b8251f6e8727530646dbe4b87119 (diff) | |
| parent | 1d9a2f4dc37cba1635d1b80fa83883365ef24e01 (diff) | |
| download | NetworkManager-th/tmp.tar.gz | |
Merge remote-tracking branch 'origin/th/build-fixes-cloud-setup' into lr/more-cloud-setup-teststh/tmp
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | meson_options.txt | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 4858aacd5e..98efaa2e21 100644 --- a/configure.ac +++ b/configure.ac @@ -1049,6 +1049,7 @@ else fi AM_CONDITIONAL(WITH_LIBPSL, test "$with_libpsl" != "no") +have_libcurl='' AC_ARG_ENABLE(concheck, AS_HELP_STRING([--enable-concheck], [enable connectivity checking support]), @@ -1085,9 +1086,11 @@ fi AM_CONDITIONAL(BUILD_NMCLI, test "$build_nmcli" = yes) AC_ARG_WITH(nm-cloud-setup, - AS_HELP_STRING([--with-nm-cloud-setup=yes|no], [Build nm-cloud-setup, a tool for automatically configure networking in cloud (EXPERIMENTAL!)])) + AS_HELP_STRING([--with-nm-cloud-setup=yes|no], [Build nm-cloud-setup, a tool for automatically configure networking in cloud])) if test "$with_nm_cloud_setup" != no; then - PKG_CHECK_MODULES(LIBCURL, [libcurl >= 7.24.0], [have_libcurl=yes], [have_libcurl=no]) + if test "$have_libcurl" == ""; then + PKG_CHECK_MODULES(LIBCURL, [libcurl >= 7.24.0], [have_libcurl=yes], [have_libcurl=no]) + fi if test "$have_libcurl" != "yes"; then AC_MSG_ERROR(--with-nm-cloud-setup requires libcurl library.) fi diff --git a/meson_options.txt b/meson_options.txt index 4e359f9e92..e4005f1276 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -39,7 +39,7 @@ option('teamdctl', type: 'boolean', value: false, description: 'enable Teamd con option('ovs', type: 'boolean', value: true, description: 'enable Open vSwitch support') option('nmcli', type: 'boolean', value: true, description: 'Build nmcli') option('nmtui', type: 'boolean', value: true, description: 'Build nmtui') -option('nm_cloud_setup', type: 'boolean', value: false, description: 'Build nm-cloud-setup, a tool for automatically configure networking in cloud (EXPERIMENTAL!)') +option('nm_cloud_setup', type: 'boolean', value: true, description: 'Build nm-cloud-setup, a tool for automatically configure networking in cloud') option('bluez5_dun', type: 'boolean', value: false, description: 'enable Bluez5 DUN support') option('ebpf', type: 'combo', choices: ['auto', 'true', 'false'], description: 'Enable eBPF support') |