X-Git-Url: https://git.distorted.org.uk/~mdw/mLib-python/blobdiff_plain/244ede1869d2b168cf311bb327a5758d11fc0f66..376ad06df03e59ebf0796b2f475417150e82252d:/setup.py

diff --git a/setup.py b/setup.py
index 13759e3..d59471f 100644
--- a/setup.py
+++ b/setup.py
@@ -18,14 +18,10 @@ def progoutput(cmd):
   return out.rstrip('\n')
 
 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 --cflags "%s >= %s"' % (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 --libs "%s >= %s"' % (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,7 +36,7 @@ def uniquify(l):
   return o
 
 libconfig('catacomb', '2.1.0')
-libconfig('mLib', '2.0.3')
+libconfig('mLib', '2.1.0')
 
 def needs_update_p(target, sources):
   if not path.exists(target): return True