meson.build: separate option for installing the xfree86 SDK

There are scenarios where one either only wants to install the SDK headers
(e.g. just compiling drivers) or install Xorg w/ the headers. Thus adding
a new option for controlling this. By default (auto) the SDK will be
enabled when Xorg is enabled.

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

Xext/meson.build

@@ -73,6 +73,6 @@ libxserver_xext_vidmode = static_library('libxserver_xext_vidmode',
     dependencies: common_dep,
 )
 
-if build_xorg
+if build_xorg_sdk
     install_data(hdrs_xext, install_dir: xorgsdkdir)
 endif

composite/meson.build

@@ -16,6 +16,6 @@ libxserver_composite = static_library('libxserver_composite',
 	dependencies: common_dep,
 )
 
-if build_xorg
+if build_xorg_sdk
     install_data(hdrs_composite, install_dir: xorgsdkdir)
 endif

dri3/meson.build

@@ -17,6 +17,6 @@ if build_dri3
         )
 endif
 
-if build_xorg
+if build_xorg_sdk
     install_data(hdrs_dri3, install_dir: xorgsdkdir)
 endif

exa/meson.build

@@ -19,6 +19,6 @@ libxserver_exa = static_library('libxserver_exa',
     c_args: '-DHAVE_XORG_CONFIG_H'
 )
 
-if build_xorg
+if build_xorg_sdk
     install_data('exa.h', install_dir: xorgsdkdir)
 endif

fb/meson.build

@@ -55,6 +55,6 @@ libxserver_wfb = static_library('libxserver_wfb',
 	build_by_default: false,
 )
 
-if build_xorg
+if build_xorg_sdk
     install_data(hdrs_fb, install_dir: xorgsdkdir)
 endif

glamor/meson.build

@@ -51,6 +51,6 @@ glamor = static_library('glamor',
     ],
 )
 
-if build_xorg
+if build_xorg_sdk
     install_data('glamor.h', install_dir: xorgsdkdir)
 endif

glx/meson.build

@@ -79,7 +79,7 @@ if build_glx
         ],
     )
 
-    if build_xorg
+    if build_xorg_sdk
         install_data(hdrs_vnd, install_dir : xorgsdkdir)
     endif
 endif

include/meson.build

@@ -333,7 +333,7 @@ configure_file(output : 'dix-config.h',
 configure_file(output : 'xorg-server.h',
                input : 'xorg-server.h.meson.in',
                configuration : conf_data,
-               install: build_xorg,
+               install: build_xorg_sdk,
                install_dir: xorgsdkdir)
 
 version_data = configuration_data()
@@ -438,7 +438,7 @@ if with_dtrace
     dtrace_hdr += dtrace_header.process(dtrace_tmpl)
 endif
 
-if build_xorg
+if build_xorg_sdk
     install_data(
         [
             'Xprintf.h',

meson.build

@@ -212,6 +212,11 @@ endif
 xorgsdkdir = join_paths(get_option('prefix'), get_option('includedir'), 'xorg')
 libxcvt_dep = dependency('libxcvt', fallback: ['libxcvt', 'libxcvt_dep'], required: build_xorg)
 
+build_xorg_sdk = get_option('xorg_sdk') == 'true'
+if get_option('xorg_sdk') == 'auto'
+    build_xorg_sdk = build_xorg
+endif
+
 build_xwayland = false
 if (host_machine.system() != 'darwin' and
     host_machine.system() != 'windows' and
@@ -824,7 +829,7 @@ if host_machine.system() != 'windows'
     subdir('test')
 endif
 
-if build_xorg
+if build_xorg_sdk
     sdkconfig = configuration_data()
     awk = find_program('awk')
 

meson_options.txt

@@ -1,5 +1,7 @@
 option('xorg', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
        description: 'Enable Xorg X Server')
+option('xorg_sdk', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
+       description: 'Enable Xorg X Server SDK')
 option('xephyr', type: 'boolean', value: false,
        description: 'Enable Xephyr nested X server')
 option('xwayland', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',

mi/meson.build

@@ -49,6 +49,6 @@ libxserver_mi = static_library('libxserver_mi',
     ],
 )
 
-if build_xorg
+if build_xorg_sdk
     install_data(hdrs_mi, install_dir: xorgsdkdir)
 endif

miext/damage/meson.build

@@ -13,6 +13,6 @@ libxserver_miext_damage = static_library('libxserver_miext_damage',
 	dependencies: common_dep,
 )
 
-if build_xorg
+if build_xorg_sdk
     install_data(hdrs_miext_damage, install_dir: xorgsdkdir)
 endif

miext/shadow/meson.build

@@ -35,6 +35,6 @@ libxserver_miext_shadow = static_library('libxserver_miext_shadow',
     dependencies: common_dep,
 )
 
-if build_xorg
+if build_xorg_sdk
     install_data(hdrs_miext_shadow, install_dir: xorgsdkdir)
 endif

miext/sync/meson.build

@@ -23,6 +23,6 @@ libxserver_miext_sync = static_library('libxserver_miext_sync',
     ],
 )
 
-if build_xorg
+if build_xorg_sdk
     install_data(hdrs_miext_sync, install_dir: xorgsdkdir)
 endif

present/meson.build

@@ -26,6 +26,6 @@ libxserver_present = static_library('libxserver_present',
     ],
 )
 
-if build_xorg
+if build_xorg_sdk
     install_data(hdrs_present, install_dir: xorgsdkdir)
 endif

randr/meson.build

@@ -31,6 +31,6 @@ libxserver_randr = static_library('libxserver_randr',
     dependencies: common_dep,
 )
 
-if build_xorg
+if build_xorg_sdk
     install_data(hdrs_randr, install_dir: xorgsdkdir)
 endif

render/meson.build

@@ -25,6 +25,6 @@ libxserver_render = static_library('libxserver_render',
     dependencies: common_dep,
 )
 
-if build_xorg
+if build_xorg_sdk
     install_data(hdrs_render, install_dir: xorgsdkdir)
 endif