meson.build: move writing conf_data into tail of main meson file

This allows us to do further probing in the included meson files:
Individual subdirectories (eg. DDXes, extensions, OS layer, ...)
can now probe things that are only relevant to them - no need to fill
the already too fat includes/meson.build with even more things.

Preparation for upcoming commits that'll make us of that.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

hw/xwin/meson.build

@@ -105,7 +105,7 @@ srcs_windows += [
 
 rsrc = windows.compile_resources(
      'XWin.rc',
-     include_directories: include_directories('../../include/'),
+     include_directories: include_directories('../../include/', '../..'),
      depend_files: ['XWin.exe.manifest', 'X.ico'],
 )
 srcs_windows += rsrc

include/meson.build

@@ -329,15 +329,6 @@ conf_data.set('XSERVER_LIBPCIACCESS', get_option('pciaccess') ? '1' : false)
 conf_data.set('XSERVER_PLATFORM_BUS', build_udev_kms ? '1' : false)
 conf_data.set('XSERVER_SCREEN_VRR', '1')
 
-configure_file(output : 'dix-config.h',
-               configuration : conf_data)
-
-configure_file(output : 'xorg-server.h',
-               input : 'xorg-server.h.meson.in',
-               configuration : conf_data,
-               install: build_xorg,
-               install_dir: xorgsdkdir)
-
 version_data = configuration_data()
 version_data.set('VENDOR_RELEASE', '@0@'.format(release))
 version_data.set_quoted('VENDOR_NAME', get_option('vendor_name'))

meson.build

@@ -908,3 +908,14 @@ if build_docs or build_docs_devel
         configuration: docxmlconfig
     )
 endif
+
+# finally write config files. doing that very late, so other subdirs still
+# have a change to add config items
+configure_file(output : 'dix-config.h',
+               configuration : conf_data)
+
+configure_file(output : 'xorg-server.h',
+               input : 'include/xorg-server.h.meson.in',
+               configuration : conf_data,
+               install: build_xorg,
+               install_dir: xorgsdkdir)