diff options
| author | Michael Biebl <biebl@debian.org> | 2019-04-21 21:10:42 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2019-04-21 21:10:42 +0200 |
| commit | 1761e93f84aba1f3a2f0ebc3d753303f27395fed (patch) | |
| tree | 2a0aa70159a57641294d4aee7aee061bc25c0a7b /meson.build | |
| parent | 6cbf8459e4602877369dbf20c6597708725758c6 (diff) | |
| parent | 85563b7fc7ec2cd21e38debb9b28db342e2e8e7c (diff) | |
Update upstream source from tag 'upstream/1.18.0'
Update to upstream version '1.18.0' with Debian dir c79ce54aa2bd35bd9bd13eb01cf8687eaae2c0c1
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/meson.build b/meson.build index 49818791..27bcd033 100644 --- a/meson.build +++ b/meson.build @@ -4,7 +4,7 @@ project( # - add corresponding NM_VERSION_x_y_z macros in # "shared/nm-version-macros.h.in" # - update number in configure.ac - version: '1.16.0', + version: '1.18.0', license: 'GPL2+', default_options: [ 'buildtype=debugoptimized', @@ -327,6 +327,11 @@ if enable_libnm_glib endif # FIXME: do this better!!! have_fake_typelibs = enable_libnm_glib and enable_introspection +if have_fake_typelibs and gio_unix_dep.version().version_compare('< 2.51.1') + warning('cannot build fake typelibs for libnm because glib is too old') + have_fake_typelibs=false +endif + config_h.set10('WITH_FAKE_TYPELIBS', have_fake_typelibs) udev_dir = get_option('udev_dir') @@ -437,7 +442,8 @@ config_h.set10('HAVE_SELINUX', enable_selinux) # eBPF support ebpf_opt = get_option('ebpf') -if ebpf_opt == 'false' +# 'auto' means 'false', because there are still issues. +if ebpf_opt != 'true' enable_ebpf = false else enable_ebpf = true |