Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/python-efl
Dir : e17/proto/python-efl/python-e_dbus
Modified Files:
setup.py
Log Message:
Support -D in pkg-config flags, avoid failing on unknown flags.
Thanks to Vincent (caro) for reporting.
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-e_dbus/setup.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- setup.py 29 Sep 2007 16:29:51 -0000 1.2
+++ setup.py 29 Jan 2008 15:47:32 -0000 1.3
@@ -9,16 +9,21 @@
def pkgconfig(*packages, **kw):
- flag_map = {"-I": "include_dirs", "-L": "library_dirs", "-l": "libraries"}
- pkgs = " ".join(packages)
- cmdline = "pkg-config --libs --cflags %s" % pkgs
+ flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries',
+ '-D': 'prepro_vars'}
+ pkgs = ' '.join(packages)
+ cmdline = 'pkg-config --libs --cflags %s' % pkgs
status, output = commands.getstatusoutput(cmdline)
if status != 0:
raise ValueError("could not find pkg-config module: %s" % pkgs)
for token in output.split():
- kw.setdefault(flag_map.get(token[:2]), []).append(token[2:])
+ flag = flag_map.get(token[:2], None)
+ if flag is not None:
+ kw.setdefault(flag, []).append(token[2:])
+ else:
+ print "WARNING: Unknown pkg-config flag: %s" % token
return kw
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
