gistfile1.txt

Index: bindings/python/SConscript
===================================================================
--- bindings/python/SConscript	(revision 2607)
+++ bindings/python/SConscript	(working copy)
@@ -153,7 +153,7 @@
 if env['SVN_REVISION']:
     sources.remove('mapnik_python.cpp')
     env2 = py_env.Clone()
-    env2.Append(CCFLAGS='-DSVN_REVISION=%s' % env['SVN_REVISION'])
+    env2.Append(CXXFLAGS='-DSVN_REVISION=%s' % env['SVN_REVISION'])
     if env['HAS_CAIRO'] or env['HAS_PYCAIRO']:
         if env['HAS_CAIRO']:
             env2.ParseConfig('pkg-config --libs --cflags cairomm-1.0')
@@ -164,14 +164,18 @@
     sources.insert(0,env2.SharedObject('mapnik_python.cpp'))
 
 if env['HAS_CAIRO'] or env['HAS_PYCAIRO']:
+    # attach libs to _mapnik.so linking environment
+    py_env.ParseConfig('pkg-config --libs cairomm-1.0')
     env2 = py_env.Clone()
-    env2.ParseConfig('pkg-config --libs --cflags cairomm-1.0')
     fixup = ['mapnik_image.cpp','python_cairo.cpp']
+    if not env['SVN_REVISION']:
+        fixup.append('mapnik_python.cpp')
     for cpp in fixup:
         if cpp in sources:
             sources.remove(cpp)
     if env['HAS_CAIRO']:
         env2.Append(CXXFLAGS = '-DHAVE_CAIRO')
+        env2.ParseConfig('pkg-config --cflags cairomm-1.0')
     if env['HAS_PYCAIRO']:
         env2.ParseConfig('pkg-config --cflags pycairo')
         env2.Append(CXXFLAGS = '-DHAVE_PYCAIRO')