Commit 43ef9406 authored by Laurent Carlier's avatar Laurent Carlier Committed by Adam Jackson

meson: Make more extensions optional

Just mimic autoconf file for xf86bigfont, screensaver,
xres, xace and xinerama extensions
Signed-off-by: Laurent Carlier's avatarLaurent Carlier <>
Reviewed-by: Adam Jackson's avatarAdam Jackson <>
parent 3203dd17
......@@ -169,7 +169,7 @@ conf_data.set('DRI3', build_dri3)
conf_data.set_quoted('DRI_DRIVER_PATH', dri_dep.get_pkgconfig_variable('dridriverdir'))
conf_data.set('HAS_SHM', '1')
conf_data.set('MITSHM', build_mitshm)
conf_data.set('PANORAMIX', '1')
conf_data.set('PANORAMIX', build_xinerama)
conf_data.set('PRESENT', '1')
conf_data.set('RANDR', '1')
conf_data.set('RES', build_res)
......@@ -340,16 +340,17 @@ if build_xquartz
build_dpms = false
build_xf86bigfont = get_option('xf86bigfont')
build_screensaver = get_option('screensaver')
build_res = get_option('xres')
build_xace = get_option('xace')
build_xinerama = get_option('xinerama')
# XXX: Allow configuration of these.
build_apm = false
build_acpi = false
build_mitshm = true
build_res = true
build_screensaver = true
build_xace = true
build_xsecurity = true
build_xf86bigfont = true
build_xinerama = true
build_xselinux = false
build_xv = true
build_dga = false
......@@ -59,6 +59,16 @@ option('vgahw', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto'
description: 'Xorg VGA access module')
option('dpms', type: 'boolean', value: true,
description: 'Xorg DPMS extension')
option('xf86bigfont', type: 'boolean', value: false,
description: 'XF86 Big Font extension')
option('screensaver', type: 'boolean', value: true,
description: 'ScreenSaver extension')
option('xres', type: 'boolean', value: true,
description: 'XRes extension')
option('xace', type: 'boolean', value: true,
description: 'X-ACE extension')
option('xinerama', type: 'boolean', value: true,
description: 'Xinerama extension')
option('dri1', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto', description: 'Build DRI1 extension (default: auto)')
option('dri2', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto', description: 'Build DRI2 extension (default: auto)')
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment