diff options
| author | Eric Anholt <eric@anholt.net> | 2018-08-07 16:23:12 -0700 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2018-08-09 13:28:19 -0400 |
| commit | 9869512cbf1bd87146f59106c0c71bda76cc0dcc (patch) | |
| tree | 5e99fad4570d077716040810c6a39654168e1c02 | |
| parent | 843e44adf17b2828991a26ac3f8f82cf2fa63bd3 (diff) | |
meson: Add HAVE_LIBDISPATCH define to xquartz build.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | hw/xquartz/meson.build | 20 | ||||
| -rw-r--r-- | include/meson.build | 1 |
2 files changed, 13 insertions, 8 deletions
diff --git a/hw/xquartz/meson.build b/hw/xquartz/meson.build index f92fbc960..ebb24132c 100644 --- a/hw/xquartz/meson.build +++ b/hw/xquartz/meson.build @@ -17,6 +17,18 @@ srcs = [ '../../mi/miinitext.c', ] +xquartz_c_args = [ + '-DXFree86Server', + # XXXX: BUILD_DATE + '-DXSERVER_VERSION="' + meson_project.version() + '"', + '-DINXQUARTZ', + '-DUSE_NEW_CLUT', +] + +if cc.has_function('dispatch_async') + xquartz_c_args += '-DHAVE_LIBDISPATCH' +endif + executable( 'Xquartz', srcs, @@ -29,12 +41,6 @@ executable( libxserver_glx, libxserver_pseudoramix, ], - c_args: [ - '-DXFree86Server', - # XXXX: BUILD_DATE - '-DXSERVER_VERSION="' + meson_project.version() + '"', - '-DINXQUARTZ', - '-DUSE_NEW_CLUT', - ], + c_args: xquartz_c_args, install: true, ) diff --git a/include/meson.build b/include/meson.build index 3548ac3c9..43139fa97 100644 --- a/include/meson.build +++ b/include/meson.build @@ -54,7 +54,6 @@ conf_data.set('HAS_APERTURE_DRV', host_machine.system() == 'openbsd') # XXX: FALLBACK_INPUT_DRIVER # XXX: BUNDLE_ID_PREFIX -# XXX: HAVE_LIBDISPATCH conf_data.set_quoted('OSNAME', 'Linux') # XXX conf_data.set('HAVE_INPUTTHREAD', '1') # XXX |