Author: uwestoehr
Date: Thu May 12 20:49:05 2011
New Revision: 38727
URL: http://www.lyx.org/trac/changeset/38727
Log:
SCons: link hunspell instead of Aspell
Modified:
lyx-devel/branches/BRANCH_2_0_X/development/scons/SConstruct
lyx-devel/branches/BRANCH_2_0_X/development/scons/build_msvc.bat
Modified: lyx-devel/branches/BRANCH_2_0_X/development/scons/SConstruct
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/development/scons/SConstruct Thu May
12 20:48:53 2011 (r38726)
+++ lyx-devel/branches/BRANCH_2_0_X/development/scons/SConstruct Thu May
12 20:49:05 2011 (r38727)
@@ -720,6 +720,8 @@
if platform_name == 'win32' and mode == 'debug' and use_vc:
aspell_lib = 'aspelld'
+hunspell_lib = 'libhunspell'
+
# check the existence of config.h
config_h = os.path.join(env.Dir('$BUILDDIR/src').path, 'config.h')
boost_config_h = os.path.join(env.Dir('$BUILDDIR/boost').path, 'config.h')
@@ -820,7 +822,7 @@
spell_engine = 'USE_ASPELL'
elif spell_opt in ['auto', 'enchant'] and conf.CheckLib('enchant'):
spell_engine = 'USE_ENCHANT'
-elif spell_opt in ['auto', 'hunspell'] and conf.CheckLib('hunspell'):
+elif spell_opt in ['auto', 'hunspell'] and conf.CheckLib(hunspell_lib):
spell_engine = 'USE_HUNSPELL'
else:
spell_engine = None
@@ -1242,7 +1244,7 @@
('HAVE_LIBAIKSAURUS', env['AIKSAURUS_LIB']),
('USE_ASPELL', aspell_lib),
('USE_ENCHANT', 'enchant'),
- ('USE_HUNSPELL', 'hunspell')
+ ('USE_HUNSPELL', hunspell_lib)
]
for lib in libs:
@@ -1786,7 +1788,7 @@
languages = None
if env.has_key('languages'):
languages = env.make_list(env['lanauges'])
- # use defulat msgfmt
+ # use default msgfmt
gmo_files = []
if not env['MSGFMT']:
print 'msgfmt does not exist. Can not process po files'
Modified: lyx-devel/branches/BRANCH_2_0_X/development/scons/build_msvc.bat
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/development/scons/build_msvc.bat Thu May
12 20:48:53 2011 (r38726)
+++ lyx-devel/branches/BRANCH_2_0_X/development/scons/build_msvc.bat Thu May
12 20:49:05 2011 (r38727)
@@ -1 +1 @@
-call scons install prefix=..\..\build-msvc use_vc=yes spell=aspell
frontend=qt4 mode=release version_suffix=20 gettext=system nls=yes
extra_inc_path=..\..\lyx-windows-deps-msvc2008\include
extra_lib_path=..\..\lyx-windows-deps-msvc2008\lib
extra_bin_path=..\..\lyx-windows-deps-msvc2008\bin qt_dir=..\..\..\..\Qt
\ No newline at end of file
+call scons install prefix=..\..\build-msvc use_vc=yes spell=hunspell
frontend=qt4 mode=release version_suffix=20 gettext=system nls=yes
extra_inc_path=..\..\lyx-windows-deps-msvc2008\include
extra_lib_path=..\..\lyx-windows-deps-msvc2008\lib
extra_bin_path=..\..\lyx-windows-deps-msvc2008\bin qt_dir=..\..\..\..\Qt
\ No newline at end of file
