Change lookup order for enchant-2 vs. enchant (prefer the former)

(cherry picked from commit 1ae537c5437d0f1abbf877e40a09ad59385f621b)

diff --git a/config/spell.m4 b/config/spell.m4
index 5bf36fc8eab27742919db9d010953013f801a1e8..2a030264b54ea0f903ce50755697e7d601ff07e0 100644 (file)
--- a/config/spell.m4
+++ b/config/spell.m4
@@ -45,8 +45,8 @@ AC_DEFUN([CHECK_WITH_ENCHANT],
        test "$with_enchant" = "no" && lyx_use_enchant=false
 
        if $lyx_use_enchant; then
-               PKG_CHECK_MODULES([ENCHANT], [enchant], [],
-                   [PKG_CHECK_MODULES([ENCHANT], [enchant-2], [],
+               PKG_CHECK_MODULES([ENCHANT], [enchant-2], [],
+                   [PKG_CHECK_MODULES([ENCHANT], [enchant], [],
                        [lyx_use_enchant=false])])
                AC_MSG_CHECKING([whether to use enchant])
                if $lyx_use_enchant ; then

diff --git a/status.23x b/status.23x
index 126e5c1fe9a254216cfbb1ed6771c428555cf4d9..1a4b409bebf6c9fa687a2fdfab70b53d41dc7438 100644 (file)
--- a/status.23x
+++ b/status.23x
@@ -29,6 +29,8 @@ What's new
 
 * BUILD/INSTALLATION
 
+- Add support for v.2 of the enchant spell checker (bug 10986).
+
 
 
 ** Bug fixes: