X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/catacomb-python/blobdiff_plain/b2687a0a4b3c5e45cad7c5815a6d3805bfc8d4f1..17f11fcfab463db6627747266c0ee525fa10e840:/setup.py

diff --git a/setup.py b/setup.py
index 8ff559d..cf12885 100644
--- a/setup.py
+++ b/setup.py
@@ -19,14 +19,10 @@ libdirs = []
 libs = []
 
 def libconfig(lib, ver):
-  config = lib + '-config'
-  if system('%s --check %s' % (config, ver)):
-    raise '%s version %s not found' % (lib, ver)
-  version = progoutput('%s --version' % config)
-  for i in progoutput('%s --cflags' % config).split():
+  for i in progoutput('pkg-config "%s >= %s" --cflags' % (lib, ver)).split():
     if i[:2] == '-I': incdirs.append(i[2:])
     else: raise 'strange cflags item %s' % i
-  for i in progoutput('%s --libs' % config).split():
+  for i in progoutput('pkg-config "%s >= %s" --libs' % (lib, ver)).split():
     if i[:2] == '-L': libdirs.append(i[2:])
     elif i[:2] == '-l': libs.append(i[2:])
     else: raise 'strange libs item %s' % i
@@ -40,8 +36,8 @@ def uniquify(l):
       u[i] = 1
   return o
 
-libconfig('catacomb', '2.1.0')
-libconfig('mLib', '2.0.3')
+libconfig('catacomb', '2.1.1')
+libconfig('mLib', '2.0.4')
 
 class SubprocessFailure (Exception):
   def __init__(me, file, rc):