mdwsetup.py (pkg_config): Check environment for settings.

[runlisp] / mdwsetup.py

diff --git a/mdwsetup.py b/mdwsetup.py
index 322e194b6614de559c1d3037c811e419fe292302..06990a8cc1eaefdcad9a27effa27e8ca4941da41 100644 (file)
--- a/mdwsetup.py
+++ b/mdwsetup.py
@@ -104,11 +104,14 @@ def pkg_config(pkg, version):
 
   spec = '%s >= %s' % (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)
     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)
     if word.startswith('-L'): LIBDIRS.append(word[2:])
     elif word.startswith('-l'): LIBS.append(word[2:])
     else: weird('LIBS', word)