ru.po: remerge for Yuriy

[lyx.git] / config / spell.m4

diff --git a/config/spell.m4 b/config/spell.m4
index c733dab2b45b9e32cea87ba0b7f5db7e4f360aca..a15f9f6b3ddbe2626110a73212f16c5f79be3c6e 100644 (file)
--- a/config/spell.m4
+++ b/config/spell.m4
@@ -80,7 +80,7 @@ AC_DEFUN([LYX_USE_INCLUDED_HUNSPELL],[
        AC_MSG_RESULT([$lyx_cv_with_included_hunspell])
        if test x$lyx_cv_with_included_hunspell = xyes ; then
                lyx_included_libs="$lyx_included_libs hunspell"
-               HUNSPELL_CFLAGS='-I$(top_srcdir)/3rdparty/hunspell/1.3.3/src'
+               HUNSPELL_CFLAGS='-I$(top_srcdir)/3rdparty/hunspell/1.6.2/src'
                HUNSPELL_LIBS='$(top_builddir)/3rdparty/hunspell/liblyxhunspell.a'
                AC_SUBST(HUNSPELL_CFLAGS)
                AC_SUBST(HUNSPELL_LIBS)
@@ -93,16 +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)