From ea9c19ec9d43ecb533c46081140f5453c6f61a0f Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 2 Nov 2020 23:34:37 +0100 Subject: [PATCH] libnm: with meson include "nm-default.h" for glib-mkenums sources We also do that for the autotools implementation. (cherry picked from commit fd57e9665cea3547ce63ad3d693d956cb8c286c7) (cherry picked from commit c807e77271af7972abcecd637cae85e7664cbcc9) (cherry picked from commit 63f2d73b970bba7d2b9ff5e67715e0aefe7fb2d2) (cherry picked from commit 6efb6696c7af7f2b7ae3ff007144ad22cb4378d5) --- libnm-core/meson.build | 1 + libnm-core/tests/meson.build | 1 + 2 files changed, 2 insertions(+) diff --git a/libnm-core/meson.build b/libnm-core/meson.build index 469d4161f8..214d49a5e9 100644 --- a/libnm-core/meson.build +++ b/libnm-core/meson.build @@ -79,6 +79,7 @@ libnm_core_enum_sources = gnome.mkenums_simple( enum_types, sources: libnm_core_headers + [nm_version_macro_header], identifier_prefix: nm_id_prefix, + body_prefix: '#include "nm-default.h"', install_header: true, install_dir: libnm_pkgincludedir, ) diff --git a/libnm-core/tests/meson.build b/libnm-core/tests/meson.build index 292eeaa015..9f5e179fdb 100644 --- a/libnm-core/tests/meson.build +++ b/libnm-core/tests/meson.build @@ -13,6 +13,7 @@ enum_sources = gnome.mkenums_simple( enum_types, sources: 'test-general-enums.h', identifier_prefix: nm_id_prefix, + body_prefix: '#include "nm-default.h"', ) deps = [