Changeset 724

Timestamp:

07/29/08 14:35:27 (5 months ago)

Author:

tom

Message:

Add an INTERNAL_LIBAGG build option that can be used to make mapnik
build against the system libagg instead of mapnik's copy.

Location:

trunk

Files:

• SConstruct (modified) (4 diffs)
• src/SConscript (modified) (1 diff)

trunk/SConstruct

@@ -63 +63 @@
 opts.Add(EnumOption('THREADING','Set threading support','multi', ['multi','single']))
 opts.Add(EnumOption('XMLPARSER','Set xml parser ','tinyxml', ['tinyxml','spirit','libxml2']))
+opts.Add(BoolOption('INTERNAL_LIBAGG', 'Use provided libagg', 'True'))
 
 env = Environment(ENV=os.environ, options=opts)
@@ -93 +94 @@
 
 # Libraries and headers dependency checks
-env['CPPPATH'] = ['#agg/include', '#tinyxml', '#include', '#']
-env['LIBPATH'] = ['#agg', '#src']
+env['CPPPATH'] = ['#tinyxml', '#include', '#']
+env['LIBPATH'] = ['#src']
 
 # Solaris & Sun Studio settings (the `SUNCC` flag will only be
@@ -116 +117 @@
     if env['THREADING'] == 'multi':
         env['CXXFLAGS'] = ['-mt']
+
+# Decide which libagg to use
+if env['INTERNAL_LIBAGG']:
+    env.Prepend(CPPPATH = '#agg/include');
+    env.Prepend(LIBPATH = '#agg');
+else:
+    env.ParseConfig('pkg-config --libs --cflags libagg')
 
 # Adding the prerequisite library directories to the include path for
@@ -198 +206 @@
 
 # Build agg first, doesn't need anything special
-SConscript('agg/SConscript')
+if env['INTERNAL_LIBAGG']:
+    SConscript('agg/SConscript')
 
 # Build the core library

trunk/src/SConscript

@@ -31 +31 @@
 install_prefix = env['DESTDIR'] + '/' + prefix
 
-libraries = ['agg'] + env['LIBS']
+libraries = env['LIBS']
+
+if env['INTERNAL_LIBAGG']:
+    libraries.insert(0, 'agg')
 
 if env['PLATFORM'] == 'Darwin':