From 5889f636c0b38abffa4f5bd6a343c867ac1003a2 Mon Sep 17 00:00:00 2001 From: Bo Peng Date: Thu, 14 Sep 2006 14:09:08 +0000 Subject: [PATCH] Scons: add support for system iconv function (from glibc) git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14995 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/scons/SConstruct | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/development/scons/SConstruct b/development/scons/SConstruct index e52c9e9ec5..efdaa92782 100644 --- a/development/scons/SConstruct +++ b/development/scons/SConstruct @@ -673,12 +673,12 @@ if not fast_start: or (use_vc and not conf.CheckLibWithHeader('zdll', 'zlib.h', 'C')): print 'Did not find zdll.lib or zlib.h, exiting!' Exit(1) - has_iconv = conf.CheckLib('iconv') - has_libiconv = conf.CheckLib('libiconv') - if has_iconv: - env['ICONV_LIB'] = 'iconv' - elif has_libiconv: - env['ICONV_LIB'] = 'libiconv' + if conf.CheckLib('iconv'): + env['ICONV_LIB'] = ['iconv'] + elif conf.CheckLib('libiconv'): + env['ICONV_LIB'] = ['libiconv'] + elif conf.CheckFunc('iconv_open'): + env['ICONV_LIB'] = [] else: print 'Did not find iconv or libiconv, exiting!' Exit(1) @@ -1356,19 +1356,20 @@ elif frontend == 'qt4': frontend_libs = [x + qt_lib_suffix for x in qt_libs] +system_libs = env['ICONV_LIB'] if platform_name in ['win32', 'cygwin']: # the final link step needs stdc++ to succeed under mingw # FIXME: shouldn't g++ automatically link to stdc++? if use_vc: - system_libs = [env['ICONV_LIB'], 'ole32', 'shlwapi', 'shell32', 'advapi32', 'zdll'] + system_libs += ['ole32', 'shlwapi', 'shell32', 'advapi32', 'zdll'] else: - system_libs = [env['ICONV_LIB'], 'shlwapi', 'stdc++', 'z'] + system_libs += ['shlwapi', 'stdc++', 'z'] elif platform_name == 'cygwin' and env['X11']: - system_libs = [env['ICONV_LIB'], 'GL', 'Xmu', 'Xi', 'Xrender', 'Xrandr', + system_libs += ['GL', 'Xmu', 'Xi', 'Xrender', 'Xrandr', 'Xcursor', 'Xft', 'freetype', 'fontconfig', 'Xext', 'X11', 'SM', 'ICE', 'resolv', 'pthread', 'z'] else: - system_libs = [env['ICONV_LIB'], 'z'] + system_libs += ['z'] libs = [ ('HAVE_LIBGDI32', 'gdi32'),