mdup.pyx: New support for mLib's glorious `mdup' function.

[mLib-python] / setup.py

diff --git a/setup.py b/setup.py
index 13759e39800e65ece3709abcb7c4ab5e42d48cec..d59471f7d046605e8f969e363c6b215da6566986 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -18,14 +18,10 @@ def progoutput(cmd):
   return out.rstrip('\n')
 
 def libconfig(lib, ver):
   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
     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
     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')
   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
 
 def needs_update_p(target, sources):
   if not path.exists(target): return True