Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

meson: fix defines #1086

Merged
merged 1 commit into from
Oct 26, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 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 Expand Up @@ -570,4 +570,4 @@ summary(
summary_depvals,
bool_yn: true,
section: 'Dependencies',
)
)
Loading