Skip to content
This repository
Browse code

scons: add option to configure custom paths to ltdl - refs #1376

  • Loading branch information...
commit 1e0a4ace867897f83a84f14b8ff3c3f7f26024ea 1 parent f431193
Dane Springmeyer authored August 22, 2012

Showing 1 changed file with 4 additions and 2 deletions. Show diff stats Hide diff stats

  1. 6  SConstruct
6  SConstruct
@@ -309,7 +309,9 @@ opts.AddVariables(
309 309
     PathVariable('ICU_LIBS','Search path for ICU include files','/usr/' + LIBDIR_SCHEMA_DEFAULT, PathVariable.PathAccept),
310 310
     ('ICU_LIB_NAME', 'The library name for icu (such as icuuc, sicuuc, or icucore)', 'icuuc'),
311 311
     PathVariable('PNG_INCLUDES', 'Search path for libpng include files', '/usr/include', PathVariable.PathAccept),
312  
-    PathVariable('PNG_LIBS','Search path for libpng include files','/usr/' + LIBDIR_SCHEMA_DEFAULT, PathVariable.PathAccept),
  312
+    PathVariable('PNG_LIBS','Search path for libpng library files','/usr/' + LIBDIR_SCHEMA_DEFAULT, PathVariable.PathAccept),
  313
+    PathVariable('LTDL_INCLUDES', 'Search path for libltdl (part of libtool) include files', '/usr/include', PathVariable.PathAccept),
  314
+    PathVariable('LTDL_LIBS','Search path for libltdl (ltdl.h) library files','/usr/' + LIBDIR_SCHEMA_DEFAULT, PathVariable.PathAccept),
313 315
     BoolVariable('JPEG', 'Build Mapnik with JPEG read and write support', 'True'),
314 316
     PathVariable('JPEG_INCLUDES', 'Search path for libjpeg include files', '/usr/include', PathVariable.PathAccept),
315 317
     PathVariable('JPEG_LIBS', 'Search path for libjpeg library files', '/usr/' + LIBDIR_SCHEMA_DEFAULT, PathVariable.PathAccept),
@@ -1055,7 +1057,7 @@ if not preconfigured:
1055 1057
 
1056 1058
     # Adding the required prerequisite library directories to the include path for
1057 1059
     # compiling and the library path for linking, respectively.
1058  
-    for required in ('PNG', 'JPEG', 'TIFF','PROJ','ICU', 'SQLITE'):
  1060
+    for required in ('PNG', 'JPEG', 'TIFF','PROJ','ICU', 'SQLITE', 'LTDL'):
1059 1061
         inc_path = env['%s_INCLUDES' % required]
1060 1062
         lib_path = env['%s_LIBS' % required]
1061 1063
         env.AppendUnique(CPPPATH = os.path.realpath(inc_path))

0 notes on commit 1e0a4ac

Please sign in to comment.
Something went wrong with that request. Please try again.