chiark
/
gitweb
/
~mdw
/
mLib-python
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
setup.py: Update to use pkg-config.
[mLib-python]
/
setup.py
diff --git
a/setup.py
b/setup.py
index 13759e39800e65ece3709abcb7c4ab5e42d48cec..d4b8cfad2aa41cbd73dea319b430c1edcd673e98 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