SCons: link hunspell instead of Aspell

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38727 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/scons/SConstruct b/development/scons/SConstruct
index d5c63c9bb86dcb7a0cf42f9c3fa78ac8c05f49ef..a23b07f00ba9334345b9610b6ca1f9dc82faed25 100644 (file)
--- a/development/scons/SConstruct
+++ b/development/scons/SConstruct
@@ -720,6 +720,8 @@ aspell_lib = 'aspell'
 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 @@ if spell_opt in ['auto', 'aspell'] and conf.CheckLib(aspell_lib):
     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 @@ libs = [
     ('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 @@ if 'install' in BUILD_TARGETS or 'installer' in BUILD_TARGETS:
     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'

diff --git a/development/scons/build_msvc.bat b/development/scons/build_msvc.bat
index e7b5a8781e15a21242d89570818265635a767ff8..8e1640b82e7f6ad5a373788ffe9a5424efefb66e 100644 (file)
--- a/development/scons/build_msvc.bat
+++ b/development/scons/build_msvc.bat
@@ -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