From 417a3c5916be64b60830bd328aa1f999bf53455f Mon Sep 17 00:00:00 2001 From: Matt Jolly Date: Sun, 27 Oct 2024 07:49:22 +1000 Subject: [PATCH] meson: fix defines When the initial meson build port was performed it was assumed that some defines are prefixed with `HAVE_` that are not, among other small things. This commit corrects that and brings the defines into line with what the code is actually expecting. - HAVE_FRBIDI -> HAVE_BIDI - HAVE_SHAPE -> SHAPE - HAVE_XPM -> XPM - HAVE_XSM -> HAVE_XSHM Co-authored-by: Jaimos Skriletz Signed-off-by: Matt Jolly --- meson.build | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index aed13cb1b..984eaad31 100644 --- a/meson.build +++ b/meson.build @@ -241,7 +241,7 @@ fribidi = dependency( ) if fribidi.found() all_found_deps += fribidi - conf.set10('HAVE_FRIBIDI', true) + conf.set10('HAVE_BIDI', true) endif iconv = dependency('iconv', required: get_option('iconv')) @@ -332,7 +332,7 @@ endif xext = dependency('xext', required: get_option('xext')) if xext.found() all_found_deps += xext - conf.set10('HAVE_SHAPE', true) + conf.set10('SHAPE', true) endif xkbcommon = dependency('xkbcommon', required: get_option('xkbcommon')) @@ -344,7 +344,7 @@ endif xpm = dependency('xpm', required: get_option('xpm')) if xpm.found() all_found_deps += xpm - conf.set10('HAVE_XPM', true) + conf.set10('XPM', true) endif xrender = dependency('xrender', required: get_option('xrender')) @@ -356,7 +356,7 @@ endif # Hard-coded non_configurable_ops = [ 'FMiniIconsSupported', - 'HAVE_XSM', + 'HAVE_XSHM', ] foreach nco : non_configurable_ops