From dcc4981b1364f6e4e0f3b95491ce11a69cdb511d Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Sun, 2 Jun 2013 13:30:46 -0700 Subject: [PATCH] mapnik-config: report which plugins are statically compiled by providing defines --- src/build.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/build.py b/src/build.py index 40381e29f..d6d347530 100644 --- a/src/build.py +++ b/src/build.py @@ -214,7 +214,10 @@ if env['PLUGIN_LINKING'] == 'static': details = env['PLUGINS'][plugin] if details['lib'] in env['LIBS'] or not details['lib']: hit = True - lib_env.Append(CPPDEFINES = '-DMAPNIK_STATIC_PLUGIN_%s' % plugin.upper()) + DEF = '-DMAPNIK_STATIC_PLUGIN_%s' % plugin.upper() + lib_env.Append(CPPDEFINES = DEF) + if DEF not in libmapnik_defines: + libmapnik_defines.append(DEF) plugin_env = SConscript('../plugins/input/%s/build.py' % plugin) if plugin_env.has_key('SOURCES') and plugin_env['SOURCES']: source += ['../plugins/input/%s/%s' % (plugin, src) for src in plugin_env['SOURCES']] @@ -232,6 +235,7 @@ if env['PLUGIN_LINKING'] == 'static': print("Notice: dependencies not met for plugin '%s', not building..." % plugin) if hit: lib_env.Append(CPPDEFINES = '-DMAPNIK_STATIC_PLUGINS') + libmapnik_defines.append('-DMAPNIK_STATIC_PLUGINS') if env['HAS_CAIRO']: lib_env.AppendUnique(LIBPATH=env['CAIRO_LIBPATHS'])