From 09426bf324354fc60599003c63078fc88cb835a9 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Thu, 24 May 2012 17:05:51 -0700
Subject: [PATCH] remove option to link againt external AGG - our local copy
 has critical fixes and is required

---
 SConstruct                   | 17 +++++------------
 src/build.py                 |  5 +----
 utils/mapnik-config/build.py |  4 ++--
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/SConstruct b/SConstruct
index 0b793578a..c35e77aaf 100644
--- a/SConstruct
+++ b/SConstruct
@@ -323,8 +323,6 @@ opts.AddVariables(
 
     BoolVariable('RENDERING_STATS', 'Output rendering statistics during style processing', 'False'),
 
-    BoolVariable('INTERNAL_LIBAGG', 'Use provided libagg', 'True'),
-
     BoolVariable('SVG_RENDERER', 'build support for native svg renderer', 'False'),
 
     # Variables for optional dependencies
@@ -1244,15 +1242,10 @@ if not preconfigured:
             env['SKIPPED_DEPS'].append('pgsql2sqlite_rtree')
             env['PGSQL2SQLITE'] = False
 
-    # Decide which libagg to use
-    # if we are using internal agg, then prepend to make sure
-    # we link locally
-
-    if env['INTERNAL_LIBAGG']:
-        env.Prepend(CPPPATH = '#deps/agg/include')
-        env.Prepend(LIBPATH = '#deps/agg')
-    else:
-        env.ParseConfig('pkg-config --libs --cflags libagg')
+    # we rely on an internal, patched copy of agg with critical fixes
+    # prepend to make sure we link locally
+    env.Prepend(CPPPATH = '#deps/agg/include')
+    env.Prepend(LIBPATH = '#deps/agg')
 
     if env['CAIRO']:
         if env['CAIRO_LIBS'] or env['CAIRO_INCLUDES']:
@@ -1677,7 +1670,7 @@ if not HELP_REQUESTED:
         SetOption("num_jobs", env['JOBS'])
 
     # Build agg first, doesn't need anything special
-    if env['RUNTIME_LINK'] == 'shared' and env['INTERNAL_LIBAGG']:
+    if env['RUNTIME_LINK'] == 'shared':
         SConscript('deps/agg/build.py')
 
     # Build the core library
diff --git a/src/build.py b/src/build.py
index 2a13f18e6..7df2f8eb5 100644
--- a/src/build.py
+++ b/src/build.py
@@ -75,10 +75,7 @@ if env['RUNTIME_LINK'] == 'static':
         lib_env['LIBS'].append('icudata')
         lib_env['LIBS'].append('icui18n')
 else:
-    if env['INTERNAL_LIBAGG']:
-          lib_env['LIBS'].insert(0, 'agg')
-    else:
-        lib_env['LIBS'].append([lib for lib in env['LIBS'] if lib.startswith('agg')])
+    lib_env['LIBS'].insert(0, 'agg')
 
 if env['PLATFORM'] == 'Darwin':
     mapnik_libname = env.subst(env['MAPNIK_LIB_NAME'])
diff --git a/utils/mapnik-config/build.py b/utils/mapnik-config/build.py
index 8519051e0..22f23bfc8 100644
--- a/utils/mapnik-config/build.py
+++ b/utils/mapnik-config/build.py
@@ -56,8 +56,8 @@ ldflags = config_env['CUSTOM_LDFLAGS'] + ''.join([' -L%s' % i for i in config_en
 
 dep_libs = ''.join([' -l%s' % i for i in env['LIBMAPNIK_LIBS']])
 
-if env['INTERNAL_LIBAGG']:
-    dep_libs = dep_libs.replace('-lagg','')
+# remove local agg from public linking
+dep_libs = dep_libs.replace('-lagg','')
 
 git_revision = os.popen("git rev-list --max-count=1 HEAD").read()