AC_MSG_RESULT(yes)
AC_DEFINE(USE_ASPELL, 1, [Define as 1 to use the aspell library])
lyx_flags="$lyx_flags use-aspell"
- ### Check for aspell framework name
- LYX_WITH_DIR([aspell-framework], [name of aspell framework],aspell_framework, [])
- AC_DEFINE_UNQUOTED([ASPELL_FRAMEWORK], "${lyx_cv_aspell_framework}", [Define as name of aspell framework])
else
AC_MSG_RESULT(no)
fi
test "$with_hunspell" = "no" && lyx_use_hunspell=false
if $lyx_use_hunspell ; then
- AC_CHECK_HEADERS(hunspell/hunspell.hxx,
- [lyx_use_hunspell=true; break;],
- [lyx_use_hunspell=false])
- AC_CHECK_LIB(hunspell, main, LIBS="-lhunspell $LIBS", lyx_use_hunspell=false)
-
+ PKG_CHECK_MODULES([HUNSPELL], [hunspell], [], [
+ AC_CHECK_HEADERS(hunspell/hunspell.hxx,
+ [lyx_use_hunspell=true; break;],
+ [lyx_use_hunspell=false])
+ AC_CHECK_LIB(hunspell, main, LIBS="-lhunspell $LIBS", lyx_use_hunspell=false)
+ ])
AC_MSG_CHECKING([whether to use hunspell])
if $lyx_use_hunspell ; then
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
fi
+ fi
+ ])
+
+dnl Usage: LYX_USE_INCLUDED_HUNSPELL : select if the included hunspell should
+dnl be used.
+AC_DEFUN([LYX_USE_INCLUDED_HUNSPELL],[
+ AC_MSG_CHECKING([whether to use included hunspell library])
+ AC_ARG_WITH(included-hunspell,
+ [AC_HELP_STRING([--with-included-hunspell], [use the hunspell lib supplied with LyX instead of the system one])],
+ [lyx_cv_with_included_hunspell=$withval],
+ [lyx_cv_with_included_hunspell=no])
+ AM_CONDITIONAL(USE_INCLUDED_HUNSPELL, test x$lyx_cv_with_included_hunspell = xyes)
+ 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_LIBS='$(top_builddir)/3rdparty/hunspell/liblyxhunspell.a'
+ AC_SUBST(HUNSPELL_CFLAGS)
+ AC_SUBST(HUNSPELL_LIBS)
fi
])
### Check if we want spell libraries, prefer new aspell or hunspell
AC_DEFUN([LYX_CHECK_SPELL_ENGINES],
[
- CHECK_WITH_ASPELL
- AM_CONDITIONAL(USE_ASPELL, $lyx_use_aspell)
+ 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
+ lyx_use_hunspell=true
+ lyx_flags="$lyx_flags use-hunspell"
+ else
+ CHECK_WITH_ASPELL
+ CHECK_WITH_ENCHANT
+ CHECK_WITH_HUNSPELL
+ fi
- CHECK_WITH_ENCHANT
+ AM_CONDITIONAL(USE_ASPELL, $lyx_use_aspell)
AM_CONDITIONAL(USE_ENCHANT, $lyx_use_enchant)
-
- CHECK_WITH_HUNSPELL
AM_CONDITIONAL(USE_HUNSPELL, $lyx_use_hunspell)
])
+