Changeset 1107

Timestamp:

04/25/09 23:33:29 (17 months ago)

Author:

dane

Message:

Add FULL_LIB_PATH option for OS X to link in the full path to libmapnik.dylib in the library itself

Location:

trunk

Files:

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

trunk/SConstruct

@@ -157 +157 @@
     # Other variables
     ('SYSTEM_FONTS','Provide location for python bindings to register fonts (if given aborts installation of bundled DejaVu fonts)',''),
-    ('LIB_DIR_NAME','Name to use for lib folder where fonts and plugins are installed','/mapnik/'),
+    ('LIB_DIR_NAME','Name to use for the "lib" folder where fonts and plugins are installed','/mapnik/'),
     PathVariable('PYTHON','Full path to Python executable used to build bindings', sys.executable),
-    BoolVariable('FRAMEWORK_PYTHON', 'Link against Framework Python on Mac OSX', 'True'),
+    BoolVariable('FRAMEWORK_PYTHON', 'Link against Framework Python on Mac OS X', 'True'),
+    BoolVariable('FULL_LIB_PATH', 'Use the full path for the libmapnik.dylib "install_name" when linking on Mac OS X', 'False'),
     ListVariable('BINDINGS','Language bindings to build','all',['python']),
     EnumVariable('THREADING','Set threading support','multi', ['multi','single']),

trunk/src/SConscript

@@ -30 +30 @@
 prefix = env['PREFIX']
 
+lib_dir = os.path.normpath(prefix + '/' + env['LIBDIR_SCHEMA'])
+
 install_prefix = env['DESTDIR'] + '/' + prefix
 
@@ -38 +40 @@
 
 if env['PLATFORM'] == 'Darwin':
-    linkflags = '-Wl,-install_name,libmapnik.dylib'
+    if env['FULL_LIB_PATH']:
+        lib_path = '%s/libmapnik.dylib' % lib_dir
+    else:
+        lib_path = 'libmapnik.dylib'
+    linkflags = '-Wl,-install_name,%s' % lib_path
 elif env['PLATFORM'] == 'SunOS' and env['CXX'].startswith('CC'):
     linkflags = '-R. -h libmapnik.so'
 else: # Linux and others
-    linkflags = '-Wl,-rpath-link,. -Wl,-soname,libmapnik.so.' + ("%d.%d" % (ABI_VERSION[0],ABI_VERSION[1])) 
+    linkflags = '-Wl,-rpath-link,. -Wl,-soname,libmapnik.so.' + ("%d.%d" % (ABI_VERSION[0],ABI_VERSION[1]))
 
 source = Split(