From 6d605f35075408f256580f56a06b4c9514bd105d Mon Sep 17 00:00:00 2001 Message-Id: <6d605f35075408f256580f56a06b4c9514bd105d.1715982079.git.mdw@distorted.org.uk> From: Mark Wooding Date: Sat, 5 Apr 2008 00:55:59 +0100 Subject: [PATCH] setup: Use pkg-config to find out about libraries. Organization: Straylight/Edgeware From: Mark Wooding --- setup.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) 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): -- [mdw]