From 85563b7fc7ec2cd21e38debb9b28db342e2e8e7c Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Sun, 21 Apr 2019 21:09:51 +0200
Subject: New upstream version 1.18.0

---
 meson.build | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'meson.build')

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
-- 
cgit 1.3.0-6-gf8a5