Commit 8531ea723fde41062a2cda7a5b75a01716e30a78
2021-10-08T09:51:10
build: add enable-tools option this is mainly useful for multilib, but may be useful for other users as well Signed-off-by: Alex Xu (Hello71) <alex_y_xu@yahoo.ca>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48
diff --git a/meson.build b/meson.build
index 590cf1d..2aa74c3 100644
--- a/meson.build
+++ b/meson.build
@@ -125,8 +125,6 @@ elif cc.has_header_symbol('stdlib.h', '__secure_getenv', prefix: system_ext_defi
else
message('C library does not support secure_getenv, using getenv instead')
endif
-have_getopt_long = cc.has_header_symbol('getopt.h', 'getopt_long',
- prefix: '#define _GNU_SOURCE')
if not cc.has_header_symbol('limits.h', 'PATH_MAX', prefix: system_ext_define)
if host_machine.system() == 'windows'
# see https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file#maximum-path-length-limitation
@@ -406,7 +404,7 @@ endif
man_pages = []
# Tools
-build_tools = have_getopt_long
+build_tools = get_option('enable-tools') and cc.has_header_symbol('getopt.h', 'getopt_long', prefix: '#define _GNU_SOURCE')
if build_tools
libxkbcommon_tools_internal = static_library(
'tools-internal',
diff --git a/meson_options.txt b/meson_options.txt
index 04982c6..69850b8 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -44,6 +44,12 @@ option(
description: 'Default XKB options',
)
option(
+ 'enable-tools',
+ type: 'boolean',
+ value: true,
+ description: 'Enable building tools',
+)
+option(
'enable-x11',
type: 'boolean',
value: true,
@@ -59,7 +65,7 @@ option(
'enable-wayland',
type: 'boolean',
value: true,
- description: 'Enable support for Wayland utility programs',
+ description: 'Enable support for Wayland utility programs (requires enable-tools)',
)
option(
'enable-xkbregistry',