From 48bb5b68e3d7dd44d9130e059ef99c14fb5ca457 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1igo=20Mart=C3=ADnez?= <inigomartinez@gmail.com>
Date: Wed, 28 Aug 2019 11:44:05 +0200
Subject: [PATCH] meson: Define meson information early

The used meson modules, default directories and includes have been
moved to the start of the build file, just after project related
information, so they are available early.
---
 meson.build | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/meson.build b/meson.build
index 1b7ff0fb8..69408ad34 100644
--- a/meson.build
+++ b/meson.build
@@ -65,6 +65,24 @@ libnm_pkgincludedir = join_paths(nm_includedir, libnm_name)
 
 nm_debug = get_option('buildtype').contains('debug')
 
+gnome = import('gnome')
+i18n = import('i18n')
+pkg = import('pkgconfig')
+
+po_dir = join_paths(meson.source_root(), 'po')
+
+intltool_merge = find_program('intltool-merge')
+intltool_cache = join_paths(po_dir, '.intltool-merge-cache')
+intltool_desktop_cmd = [intltool_merge, '-d', '-u', '-c', intltool_cache, po_dir, '@INPUT@', '@OUTPUT@']
+intltool_xml_cmd = [intltool_merge, '-x', '-u', '-c', intltool_cache, po_dir, '@INPUT@', '@OUTPUT@']
+
+top_inc = include_directories('.')
+
+perl = find_program('perl')
+xsltproc = find_program('xsltproc')
+
+check_exports = find_program(join_paths(meson.source_root(), 'tools', 'check-exports.sh'))
+
 cc = meson.get_compiler('c')
 
 config_h = configuration_data()
@@ -783,22 +801,6 @@ else
 fi
 '''
 
-gnome = import('gnome')
-i18n = import('i18n')
-pkg = import('pkgconfig')
-
-po_dir = join_paths(meson.source_root(), 'po')
-
-intltool_merge = find_program('intltool-merge')
-intltool_cache = join_paths(po_dir, '.intltool-merge-cache')
-intltool_desktop_cmd = [intltool_merge, '-d', '-u', '-c', intltool_cache, po_dir, '@INPUT@', '@OUTPUT@']
-intltool_xml_cmd = [intltool_merge, '-x', '-u', '-c', intltool_cache, po_dir, '@INPUT@', '@OUTPUT@']
-
-perl = find_program('perl')
-xsltproc = find_program('xsltproc')
-
-check_exports = find_program(join_paths(meson.source_root(), 'tools', 'check-exports.sh'))
-
 content_files = []
 
 # FIXME: every plugin calls to this:
@@ -814,8 +816,6 @@ check_so_symbols = \
         LD_BIND_NOW=1 LD_PRELOAD=$${LD_PRELOAD}:$(1) $(builddir)/src/NetworkManager --version >/dev/null
 '''
 
-top_inc = include_directories('.')
-
 subdir('introspection')
 subdir('shared')
 subdir('libnm-core')