[libwnck/wip/jtojnar/meson-fixes: 2/2] build: Fix requires in pc files



commit 1dbbb983ac120999282135ddec9df104e7703b37
Author: Jan Tojnar <jtojnar gmail com>
Date:   Tue Aug 13 22:01:25 2019 +0200

    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.

 meson.build | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/meson.build b/meson.build
index 632ed64..047e523 100644
--- a/meson.build
+++ b/meson.build
@@ -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']


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]