From ab5cf08d58804d59e0b8f785881d770acfedbf4e Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Tue, 1 Oct 2019 22:57:40 +0100 Subject: [PATCH] mdwsetup.py (pkg_config): Check environment for settings. This can override or replace pkg-config(1), similar to the `PKG_CHECK_MODULES' Autoconf macro. --- mdwsetup.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/mdwsetup.py b/mdwsetup.py index 322e194..06990a8 100644 --- a/mdwsetup.py +++ b/mdwsetup.py @@ -104,11 +104,14 @@ def pkg_config(pkg, version): spec = '%s >= %s' % (pkg, version) - for word in progoutput(['pkg-config', '--cflags', spec]).split(): + try: cflags = OS.environ["%s_CFLAGS" % pkg] + except KeyError: cflags = progoutput(['pkg-config', '--cflags', spec]) + for word in cflags.split(): if word.startswith('-I'): INCLUDEDIRS.append(word[2:]) else: weird('CFLAGS', word) - - for word in progoutput(['pkg-config', '--libs', spec]).split(): + try: libs = OS.environ["%s_LIBS" % pkg] + except KeyError: libs = progoutput(['pkg-config', '--libs', spec]) + for word in libs.split(): if word.startswith('-L'): LIBDIRS.append(word[2:]) elif word.startswith('-l'): LIBS.append(word[2:]) else: weird('LIBS', word) -- 2.11.0