[gtk+/wip/meson: 203/215] meson: fix XIAllowTouchEvents check

[Emmanuele Bassi <ebassi src gnome org>]

commit 3b5f5504e8407c5718c5288a963a9ffd4f999de4
Author: Tim-Philipp Müller <tim centricular com>
Date:   Fri Mar 24 11:03:56 2017 +0000

    meson: fix XIAllowTouchEvents check
    
    Need to link against dep/lib to check for function in it. Also
    misc fixes to surrounding xi-related checks.

 meson.build |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/meson.build b/meson.build
index 0c28c7c..96d1fdf 100644
--- a/meson.build
+++ b/meson.build
@@ -266,15 +266,17 @@ if x11_enabled
     cdata.set('HAVE_XSYNC', 1)
   endif
 
-  if cc.has_function('XGetEventData', dependencies : x11_dep,
-                     prefix : '#include <X11/Xlib.h>')
+  if cc.has_function('XGetEventData', dependencies : x11_dep)
     cdata.set('HAVE_XGENERICEVENTS', 1)
   endif
 
-  if xi_dep.found() and cc.has_header('X11/extensions/XInput2.h')
+  if xi_dep.found() and cc.has_header('X11/extensions/XInput2.h', dependencies : xi_dep)
     cdata.set('XINPUT_2', 1)
+    # Note that we also check that the XIScrollClassInfo struct is defined,
+    # because at least Ubuntu Oneiric seems to have XIAllowTouchEvents(),
+    # but not the XIScrollClassInfo struct
     prefix = '#include<X11/Xlib.h>\n#include<X11/extensions/XInput2.h>'
-    if cc.has_function('XIAllowTouchEvents', prefix: prefix) and cc.has_member('XIScrollClassInfo', 
'number', prefix: prefix)
+    if cc.has_function('XIAllowTouchEvents', dependencies : xi_dep) and cc.has_member('XIScrollClassInfo', 
'number', prefix: prefix, dependencies : xi_dep)
       cdata.set('XINPUT_2_2', 1)
     endif
   endif