Ticket #158: mapnik-improve-scons-search-paths.patch

File mapnik-improve-scons-search-paths.patch, 1.5 kB (added by jburgess777, 20 months ago)

Imporve SCons search paths for Postgres & GDAL

  • SConstruct

     
    5151opts.Add(PathOption('JPEG_LIBS', 'Search path for libjpeg library files', '/usr/' + LIBDIR_SCHEMA)) 
    5252opts.Add(PathOption('TIFF_INCLUDES', 'Search path for libtiff include files', '/usr/include')) 
    5353opts.Add(PathOption('TIFF_LIBS', 'Search path for libtiff library files', '/usr/' + LIBDIR_SCHEMA)) 
    54 opts.Add(PathOption('PGSQL_INCLUDES', 'Search path for PostgreSQL include files', '/usr/include')) 
     54opts.Add(PathOption('PGSQL_INCLUDES', 'Search path for PostgreSQL include files', '/usr/include/postgresql', PathOption.PathAccept)) 
    5555opts.Add(PathOption('PGSQL_LIBS', 'Search path for PostgreSQL library files', '/usr/' + LIBDIR_SCHEMA)) 
    5656opts.Add(PathOption('PROJ_INCLUDES', 'Search path for PROJ.4 include files', '/usr/local/include')) 
    5757opts.Add(PathOption('PROJ_LIBS', 'Search path for PROJ.4 library files', '/usr/local/' + LIBDIR_SCHEMA)) 
    58 opts.Add(PathOption('GDAL_INCLUDES', 'Search path for GDAL include files', '/usr/include')) 
     58opts.Add(PathOption('GDAL_INCLUDES', 'Search path for GDAL include files', '/usr/include/gdal', PathOption.PathAccept)) 
    5959opts.Add(PathOption('GDAL_LIBS', 'Search path for GDAL library files', '/usr/' + LIBDIR_SCHEMA)) 
    6060opts.Add(PathOption('PYTHON','Python executable', sys.executable)) 
    6161opts.Add(ListOption('INPUT_PLUGINS','Input drivers to include','all',['postgis','shape','raster','gdal']))