tools: drop getopt vs getopt_long differentiation
On all platforms we build on where getopt.h is available, getopt_long is also available. Only Windows doesn't have either but that's no reason for us to differentiate between the two. If we need to special-case getopt vs getopt_long, it's probably better to implement our own cross-platform version of it and use that. Fixes #161 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>master
parent
7d36a3d119
commit
449ed2b8e8
10
meson.build
10
meson.build
|
@ -123,12 +123,8 @@ 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 = cc.has_header_symbol('getopt.h', 'getopt')
|
||||
have_getopt_long = cc.has_header_symbol('getopt.h', 'getopt_long',
|
||||
prefix: '#define _GNU_SOURCE')
|
||||
if have_getopt_long
|
||||
configh_data.set10('HAVE_GETOPT_LONG', true)
|
||||
endif
|
||||
|
||||
# Silence some security & deprecation warnings on MSVC
|
||||
# for some unix/C functions we use.
|
||||
|
@ -531,7 +527,7 @@ executable('fuzz-compose', 'fuzz/compose/target.c', dependencies: test_dep)
|
|||
man_pages = []
|
||||
|
||||
# Tools
|
||||
build_tools = have_getopt
|
||||
build_tools = have_getopt_long
|
||||
if build_tools
|
||||
libxkbcommon_tools_internal = static_library(
|
||||
'tools-internal',
|
||||
|
@ -549,7 +545,6 @@ if build_tools
|
|||
dependencies: tools_dep, install: true)
|
||||
man_pages += 'tools/xkbcli.1.ronn'
|
||||
|
||||
if have_getopt_long
|
||||
executable('xkbcli-compile-keymap',
|
||||
'tools/compile-keymap.c',
|
||||
dependencies: tools_dep,
|
||||
|
@ -573,7 +568,6 @@ if build_tools
|
|||
configh_data.set10('HAVE_XKBCLI_INTERACTIVE_EVDEV', true)
|
||||
man_pages += 'tools/xkbcli-interactive-evdev.1.ronn'
|
||||
endif
|
||||
endif
|
||||
if get_option('enable-x11')
|
||||
x11_tools_dep = declare_dependency(
|
||||
link_with: libxkbcommon_x11_internal,
|
||||
|
@ -627,7 +621,7 @@ if build_tools
|
|||
configh_data.set10('HAVE_XKBCLI_INTERACTIVE_WAYLAND', true)
|
||||
endif
|
||||
|
||||
if have_getopt_long and get_option('enable-xkbregistry')
|
||||
if get_option('enable-xkbregistry')
|
||||
configh_data.set10('HAVE_XKBCLI_LIST', true)
|
||||
executable('xkbcli-list',
|
||||
'tools/registry-list.c',
|
||||
|
|
|
@ -82,7 +82,6 @@ main(int argc, char **argv)
|
|||
|
||||
while (1) {
|
||||
int c;
|
||||
#if HAVE_GETOPT_LONG
|
||||
static struct option opts[] = {
|
||||
{ "help", no_argument, 0, OPT_HELP },
|
||||
{ "version", no_argument, 0, OPT_VERSION },
|
||||
|
@ -90,9 +89,6 @@ main(int argc, char **argv)
|
|||
};
|
||||
|
||||
c = getopt_long(argc, argv, "+hV", opts, &option_index);
|
||||
#else
|
||||
c = getopt(argc, argv, "+hV");
|
||||
#endif
|
||||
if (c == -1)
|
||||
break;
|
||||
|
||||
|
|
Loading…
Reference in New Issue