Skip to content

Commit

Permalink
meson: fix defines
Browse files Browse the repository at this point in the history
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 <jaimosskriletz@gmail.com>
Signed-off-by: Matt Jolly <kangie@gentoo.org>
  • Loading branch information
2 people authored and ThomasAdam committed Oct 26, 2024
1 parent 4f89ed8 commit 417a3c5
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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'))
Expand Down Expand Up @@ -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'))
Expand All @@ -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'))
Expand All @@ -356,7 +356,7 @@ endif
# Hard-coded
non_configurable_ops = [
'FMiniIconsSupported',
'HAVE_XSM',
'HAVE_XSHM',
]

foreach nco : non_configurable_ops
Expand Down

0 comments on commit 417a3c5

Please sign in to comment.