anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-25 22:06:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCons: link hunspell instead of Aspell

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38727 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2011-05-12 18:49:05 +00:00
parent 8b9cf6dbfe
commit 1a141ae4bf
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
development/scons/SConstruct
View File

@ -720,6 +720,8 @@ aspell_lib = 'aspell'
if platform_name == 'win32' and mode == 'debug' and use_vc: if platform_name == 'win32' and mode == 'debug' and use_vc:
aspell_lib = 'aspelld' aspell_lib = 'aspelld'
hunspell_lib = 'libhunspell'
# check the existence of config.h # check the existence of config.h
config_h = os.path.join(env.Dir('$BUILDDIR/src').path, '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') boost_config_h = os.path.join(env.Dir('$BUILDDIR/boost').path, 'config.h')
@ -820,7 +822,7 @@ if spell_opt in ['auto', 'aspell'] and conf.CheckLib(aspell_lib):
spell_engine = 'USE_ASPELL' spell_engine = 'USE_ASPELL'
elif spell_opt in ['auto', 'enchant'] and conf.CheckLib('enchant'): elif spell_opt in ['auto', 'enchant'] and conf.CheckLib('enchant'):
spell_engine = 'USE_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' spell_engine = 'USE_HUNSPELL'
else: else:
spell_engine = None spell_engine = None
@ -1242,7 +1244,7 @@ libs = [
('HAVE_LIBAIKSAURUS', env['AIKSAURUS_LIB']), ('HAVE_LIBAIKSAURUS', env['AIKSAURUS_LIB']),
('USE_ASPELL', aspell_lib), ('USE_ASPELL', aspell_lib),
('USE_ENCHANT', 'enchant'), ('USE_ENCHANT', 'enchant'),
('USE_HUNSPELL', 'hunspell') ('USE_HUNSPELL', hunspell_lib)
] ]
for lib in libs: for lib in libs:
@ -1786,7 +1788,7 @@ if 'install' in BUILD_TARGETS or 'installer' in BUILD_TARGETS:
languages = None languages = None
if env.has_key('languages'): if env.has_key('languages'):
languages = env.make_list(env['lanauges']) languages = env.make_list(env['lanauges'])
# use defulat msgfmt # use default msgfmt
gmo_files = [] gmo_files = []
if not env['MSGFMT']: if not env['MSGFMT']:
print 'msgfmt does not exist. Can not process po files' print 'msgfmt does not exist. Can not process po files'

2
development/scons/build_msvc.bat
View File

@ -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 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