← Back to branch summary

~ubuntu-branches/ubuntu/trusty/mapnik/trusty

« back to all changes in this revision

Viewing changes to src/SConscript

  • Committer: Bazaar Package Importer
  • Author(s): Christophe Sauthier
  • Date: 2010-03-18 01:07:40 UTC
  • mfrom: (1.1.4 upstream) (3.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20100318010740-u01iy3n0ux9xzzir
Tags: 0.7.0-2ubuntu1
https://launchpad.net/bugs/526070
* Merge from debian testing (LP: #526070), remaining changes:
  - Bump boost build-dep and libmapnik-dev depends to boost1.40

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/SConscript
36
36
filesystem = 'boost_filesystem%s' % env['BOOST_APPEND']
37
37
regex = 'boost_regex%s' % env['BOOST_APPEND']
38
38
 
39
 
libraries = ['freetype','ltdl','png','tiff','z','jpeg','proj','icuuc',filesystem,regex]
 
39
libraries = ['freetype','ltdl','png','tiff','z','jpeg','proj',env['ICU_LIB_NAME'],filesystem,regex]
40
40
 
41
41
if '-DHAVE_CAIRO' in env['CXXFLAGS']:
42
42
    # add cairo and cairomm-1.0 to libs
49
49
    libraries.append('boost_thread%s' % env['BOOST_APPEND'])
50
50
        
51
51
if env['PLATFORM'] == 'Darwin':
52
 
    #libraries.append('icudata')
53
52
    if env['BOOST_SYSTEM_REQUIRED']:
54
53
        libraries.append('boost_system%s' % env['BOOST_APPEND'])
55
54
    
56
55
if env['INTERNAL_LIBAGG']:
57
56
    libraries.insert(0, 'agg')
 
57
else:
 
58
    libraries.append([lib for lib in env['LIBS'] if lib.startswith('agg')])
 
59
    
58
60
 
59
61
if env['PLATFORM'] == 'Darwin':
60
62
    if env['FULL_LIB_PATH']:
62
64
    else:
63
65
        lib_path = 'libmapnik.dylib'
64
66
    linkflags = '-Wl,-install_name,%s' % lib_path
65
 
    linkflags += ' -current_version 0.6.1 -compatibility_version 0.6.1'
 
67
    linkflags += ' -current_version 0.7.0 -compatibility_version 0.7.0'
66
68
elif env['PLATFORM'] == 'SunOS' and env['CXX'].startswith('CC'):
67
69
    linkflags = '-R. -h libmapnik.so'
68
70
else: # Linux and others