[gtk/gtk-3-24-meson: 61/94] meson: gtk gir: depend on xlib and include gtkx.h if X11 is enabled

[Chun-wei Fan <fanchunwei src gnome org>]

commit 6871d18486c271fee00ab59044c2ade421c17857
Author: Christoph Reiter <creiter src gnome org>
Date:   Fri Mar 29 21:45:14 2019 +0100

    meson: gtk gir: depend on xlib and include gtkx.h if X11 is enabled
    
    To match what the autotools build does.

 gtk/meson.build | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/gtk/meson.build b/gtk/meson.build
index cb08e34506..cfe2a5d399 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -955,6 +955,14 @@ if build_gir
     gtkversion,
   ]
 
+  gtk_gir_includes = [gdk_gir[0], 'Atk-1.0']
+  gtk_gir_extra_args = gir_args + ['-DGTK_COMPILATION',
+                                   '--c-include=gtk/gtk-a11y.h']
+  if x11_enabled
+    gtk_gir_includes += ['xlib-2.0']
+    gtk_gir_extra_args += ['--c-include=gtk/gtkx.h']
+  endif
+
   gtk_gir = gnome.generate_gir(libgtk,
                                sources: gtk_introspection_sources,
                                namespace: 'Gtk',
@@ -962,14 +970,11 @@ if build_gir
                                identifier_prefix: 'Gtk',
                                symbol_prefix: 'gtk',
                                export_packages: 'gtk+-3.0',
-                               includes: [ gdk_gir[0], 'Atk-1.0', ],
+                               includes: gtk_gir_includes,
                                header: 'gtk/gtk.h',
                                install: true,
                                dependencies: gdk_gir_dep,
-                               extra_args: gir_args + [
-                                 '-DGTK_COMPILATION',
-                                 '--c-include=gtk/gtk-a11y.h',
-                               ])
+                               extra_args: gtk_gir_extra_args)
   gtk_dep_sources += gtk_gir
 endif