debian: Switch to CDBS and build for Python 2.6.

[catacomb-python] / setup.py

diff --git a/setup.py b/setup.py
index 8ff559d01d0759b693e1f56f474c633cc03ad5d0..cf12885ef87851af93aaca1e4800542364815ed3 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -19,14 +19,10 @@ libdirs = []
 libs = []
 
 def libconfig(lib, ver):
 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
     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
     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
 
       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):
 
 class SubprocessFailure (Exception):
   def __init__(me, file, rc):