From 0d310d5ba32c4b075ba8fba6d198d2edb8d96849 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Thu, 13 Jan 2011 20:53:18 +0000 Subject: [PATCH] scons: make sure to handle adding custom flags onto mapnik_python.cpp compile *even* if we do not know the SVN_REVISION --- bindings/python/SConscript | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bindings/python/SConscript b/bindings/python/SConscript index 5eab3bf4c..fc9b0a457 100644 --- a/bindings/python/SConscript +++ b/bindings/python/SConscript @@ -184,7 +184,7 @@ if 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') + env2.ParseConfig('pkg-config --cflags cairomm-1.0') env2.Append(CXXFLAGS = '-DHAVE_CAIRO') if env['HAS_PYCAIRO']: env2.ParseConfig('pkg-config --cflags pycairo') @@ -196,6 +196,8 @@ if env['HAS_CAIRO'] or env['HAS_PYCAIRO']: py_env.ParseConfig('pkg-config --libs cairomm-1.0') env2 = py_env.Clone() 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)