From c287b1330ea57202988a533e2b045b8ad6861ff6 Mon Sep 17 00:00:00 2001 From: Bo Peng Date: Thu, 15 Jun 2006 02:45:57 +0000 Subject: [PATCH] Scons: bug fix for default_boost_option git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14114 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/scons/SConstruct | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/development/scons/SConstruct b/development/scons/SConstruct index 6c1b58b9cb..f87f337e98 100644 --- a/development/scons/SConstruct +++ b/development/scons/SConstruct @@ -425,7 +425,7 @@ else: # in the current code page (number) # C4996: foo was decleared deprecated CCFLAGS_required.extend(['/TP', '/EHsc']) - CCFLAGS_default.extend(['/wd4819', '/wd4996']) + CCFLAGS_default.extend(['/wd4819', '/wd4996', '/nologo']) env.Append(C_CCFLAGS=['/Dinline#', '/D__attribute__(x)#', '/Duintmax_t=UINT_MAX']) # for debug/release mode @@ -623,7 +623,7 @@ else: if not fast_start: # check boost libraries - boost_opt = ARGUMENTS.get('boost', default_boost_opt) + boost_opt = ARGUMENTS.get('boost', 'auto') # check for system boost paths = env['LIBPATH'] + ['/usr/lib', '/usr/local/lib'] env['BOOST_LIBRARIES'] = [] @@ -675,7 +675,7 @@ if not fast_start: env['INCLUDED_GETTEXT'] = False else: # check gettext libraries - gettext_opt = ARGUMENTS.get('gettext', default_gettext_opt) + gettext_opt = ARGUMENTS.get('gettext', 'auto') # check for system gettext succ = False if gettext_opt in ['auto', 'system']: