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

diff --git a/setup.py b/setup.py
index 6d287c0..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):
@@ -78,28 +74,28 @@ for g in ['algorithms.h']:
     fnew = fout + '.new'
     if kid == 0:
       try:
-        out = file(fnew, 'w')
-        dup2(out.fileno(), stdout.fileno())
-        out.close()
-        execl(sys.executable, sys.executable, fin)
+	out = file(fnew, 'w')
+	dup2(out.fileno(), stdout.fileno())
+	out.close()
+	execl(sys.executable, sys.executable, fin)
       except:
-        stderr.write('error running %s -> %s: %s\n' %
-                     (fin, fout, sys.exc_info()[1]))
-        _exit(127)
+	stderr.write('error running %s -> %s: %s\n' %
+		     (fin, fout, sys.exc_info()[1]))
+	_exit(127)
     _, rc = waitpid(kid, 0)
     if rc:
       raise SubprocessFailure, (fin, rc)
     rename(fnew, fout)
 
 cat = Extension('catacomb._base',
-                ['catacomb.c', 'bytestring.c', 'buffer.c',
-                 'rand.c', 'algorithms.c', 'pubkey.c', 'pgen.c',
-                 'mp.c', 'field.c', 'ec.c', 'group.c', 'passphrase.c',
-                 'share.c', 'key.c', 'util.c'],
-                ##extra_compile_args = ['-O0'],
-                include_dirs = uniquify(incdirs),
-                library_dirs = uniquify(libdirs),
-                libraries = uniquify(libs))
+		['catacomb.c', 'bytestring.c', 'buffer.c',
+		 'rand.c', 'algorithms.c', 'pubkey.c', 'pgen.c',
+		 'mp.c', 'field.c', 'ec.c', 'group.c', 'passphrase.c',
+		 'share.c', 'key.c', 'util.c'],
+		##extra_compile_args = ['-O0'],
+		include_dirs = uniquify(incdirs),
+		library_dirs = uniquify(libdirs),
+		libraries = uniquify(libs))
 
 setup(name = 'catacomb-python',
       version = '1.0.0',