SF.net SVN: matplotlib: [3652] trunk/matplotlib/setupext.py

[<md...@us...>]

Revision: 3652
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=3652&view=rev
Author:   mdboom
Date:     2007-08-01 06:03:00 -0700 (Wed, 01 Aug 2007)

Log Message:
-----------
Fix handling of def/undef macros

Modified Paths:
--------------
    trunk/matplotlib/setupext.py

Modified: trunk/matplotlib/setupext.py
===================================================================
--- trunk/matplotlib/setupext.py	2007-08-01 12:41:17 UTC (rev 3651)
+++ trunk/matplotlib/setupext.py	2007-08-01 13:03:00 UTC (rev 3652)
@@ -193,12 +193,19 @@
     status, output = commands.getstatusoutput(
         "%s %s %s" % (pkg_config_exec, flags, packages))
     if status == 0:
+        output += ' -UFOO'
         for token in output.split():
             attr = _flags.get(token[:2], None)
             if attr is not None:
+                if token[:2] == '-D':
+                    value = tuple(token[2:].split('='))
+                    if len(value) == 1:
+                        value = (value[0], None)
+                else:
+                    value = token[2:]
                 set = getattr(module, attr)
-                if token[2:] not in set:
-                    set.append(token[2:])
+                if value not in set:
+                    set.append(value)
             else:
                 if token not in module.extra_link_args:
                     module.extra_link_args.append(token)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.