commit 573a621a779a80ea7a0c29dcae718bcffa7f1db2
author Davide Pesavento <davidepesa@gmail.com> Sat Jul 09 21:56:41 2022 -0400
committer Davide Pesavento <davidepesa@gmail.com> Sat Jul 09 21:58:27 2022 -0400
tree 37db93f6814c44da77732e47322cc9ba81454cf5
parent e78fd4d972d0b34711896086ae5eab848b1f2595

build: support CentOS Stream 9

Change-Id: I851b76d8159a2c1023f2a743340005795f315a6a

wscript

diff --git a/wscript b/wscript
index 40e0602..f5a330e 100644
--- a/wscript
+++ b/wscript
@@ -9,7 +9,8 @@
 
 def options(opt):
     opt.load(['compiler_cxx', 'gnu_dirs'])
-    opt.load(['default-compiler-flags', 'coverage', 'sanitizers',
+    opt.load(['default-compiler-flags',
+              'coverage', 'sanitizers',
               'boost', 'openssl', 'sqlite3'],
              tooldir=['.waf-tools'])
 
@@ -19,10 +20,16 @@
 
 def configure(conf):
     conf.load(['compiler_cxx', 'gnu_dirs',
-               'default-compiler-flags', 'boost', 'openssl', 'sqlite3'])
+               'default-compiler-flags',
+               'boost', 'openssl', 'sqlite3'])
 
     conf.env.WITH_TESTS = conf.options.with_tests
 
+    # Prefer pkgconf if it's installed, because it gives more correct results
+    # on Fedora/CentOS/RHEL/etc. See https://bugzilla.redhat.com/show_bug.cgi?id=1953348
+    # Store the result in env.PKGCONFIG, which is the variable used inside check_cfg()
+    conf.find_program(['pkgconf', 'pkg-config'], var='PKGCONFIG')
+
     pkg_config_path = os.environ.get('PKG_CONFIG_PATH', f'{conf.env.LIBDIR}/pkgconfig')
     conf.check_cfg(package='libndn-cxx', args=['libndn-cxx >= 0.8.0', '--cflags', '--libs'],
                    uselib_store='NDN_CXX', pkg_config_path=pkg_config_path)