[prev in list] [next in list] [prev in thread] [next in thread] 

List:       lyx-cvs
Subject:    [LyX/2.3.x] Do not disable the other spellers when compiling against internal hunspell
From:       Juergen Spitzmueller <spitz () lyx ! org>
Date:       2017-09-18 16:08:45
Message-ID: 20170918160845.A65A428030A () lyx ! lyx ! org
[Download RAW message or body]

commit 2c9fd212fdee1cf923c94af50a6d35349fbaf1d1
Author: Juergen Spitzmueller <spitz@lyx.org>
Date:   Mon Sep 18 18:06:01 2017 +0200

    Do not disable the other spellers when compiling against internal hunspell
    
    Users might still want to have a selection.
    
    (cherry picked from commit 561d36a19e849d7410d8e5eb9e6898810ff237c0)
---
 config/spell.m4 |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/config/spell.m4 b/config/spell.m4
index af39006..a0a53ec 100644
--- a/config/spell.m4
+++ b/config/spell.m4
@@ -93,17 +93,15 @@ AC_DEFUN([LYX_CHECK_SPELL_ENGINES],
 [
 	LYX_USE_INCLUDED_HUNSPELL
 	if test x$lyx_cv_with_included_hunspell = xyes ; then
-dnl the user wanted to use the included hunspell, so do not check for the other spell checkers
-		lyx_use_aspell=false
-		lyx_use_enchant=false
+dnl the user wanted to use the included hunspell, so do not check for external hunspell
 		lyx_use_hunspell=true
 		AC_DEFINE(USE_HUNSPELL, 1, [Define as 1 to use the hunspell library])
 		lyx_flags="$lyx_flags use-hunspell"
 	else
-		CHECK_WITH_ASPELL
-		CHECK_WITH_ENCHANT
 		CHECK_WITH_HUNSPELL
 	fi
+	CHECK_WITH_ASPELL
+	CHECK_WITH_ENCHANT
 
 	AM_CONDITIONAL(USE_ASPELL, $lyx_use_aspell)
 	AM_CONDITIONAL(USE_ENCHANT, $lyx_use_enchant)

[prev in list] [next in list] [prev in thread] [next in thread]