From 47203035079354561b368d6519ba77263b8e7716 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Sun, 6 Feb 2011 05:30:06 +0000 Subject: [PATCH] one last workaround for now to fix potential gdal -framework configuration problem --- SConstruct | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SConstruct b/SConstruct index 8e61f8985..3172bc623 100644 --- a/SConstruct +++ b/SConstruct @@ -530,6 +530,8 @@ def parse_config(context, config, checks='--libs --cflags'): if not num_libs > env['LIBS']: env['LIBS'].append('gdal') env['LIBPATH'].insert(0,'/Library/Frameworks/GDAL.framework/unix/lib') + if 'GDAL' in env.get('FRAMEWORKS',[]): + env["FRAMEWORKS"].remove("GDAL") else: env.ParseConfig(cmd) parsed = True @@ -1377,7 +1379,6 @@ if not HELP_REQUESTED and '-c' not in command_line_args: else: color_print(1,"Notice: depedencies not met for plugin '%s', not building..." % plugin) - # todo - generalize this path construction, also used in plugin SConscript... plugin_dir = os.path.normpath(env['DESTDIR'] + '/' + env['PREFIX'] + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME']) create_uninstall_target(env, plugin_dir, False)