Commit fcb5eefb authored by Jan Tojnar's avatar Jan Tojnar Committed by Marco Trevisan

build: Fix requires in pc files

When xres or libstartup-notification are not available, they were
still being listed in Requires.private field of the pkg-config file.
This is a regression in Meson build files compared to Autotools.
parent de5d65b1
Pipeline #113733 passed with stage
in 14 minutes and 23 seconds
......@@ -74,9 +74,13 @@ pc_conf.set('prefix', get_option('prefix'))
pc_conf.set('exec_prefix', '${prefix}')
pc_conf.set('libdir', '${exec_prefix}' / get_option('libdir'))
pc_conf.set('includedir', '${prefix}' / get_option('includedir'))
pc_conf.set('STARTUP_NOTIFICATION_PACKAGE', STARTUP_NOTIFICATION_PACKAGE)
if conf.has('HAVE_' + STARTUP_NOTIFICATION_PACKAGE.to_upper().underscorify())
pc_conf.set('STARTUP_NOTIFICATION_PACKAGE', STARTUP_NOTIFICATION_PACKAGE)
endif
pc_conf.set('X11_PACKAGE', X11_PACKAGE)
pc_conf.set('XRES_PACKAGE', XRES_PACKAGE)
if conf.has('HAVE_' + XRES_PACKAGE.to_upper().underscorify())
pc_conf.set('XRES_PACKAGE', XRES_PACKAGE)
endif
pc_conf.set('VERSION', meson.project_version())
foreach pc: [PACKAGE_NAME, PACKAGE_NAME + '-uninstalled']
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment