Fix Hunspell support for the older versions (1.1.10 and older?)
Originally committed to SVN as r1955.
This commit is contained in:
parent
c31afc4018
commit
09abd27acf
2 changed files with 9 additions and 9 deletions
|
@ -94,7 +94,7 @@ endif
|
||||||
if HAVE_HUNSPELL
|
if HAVE_HUNSPELL
|
||||||
noinst_LIBRARIES += libmisc_hunspell.a
|
noinst_LIBRARIES += libmisc_hunspell.a
|
||||||
libmisc_hunspell_a_SOURCES = spellchecker_hunspell.cpp
|
libmisc_hunspell_a_SOURCES = spellchecker_hunspell.cpp
|
||||||
aegisub_LDFLAGS += @HUNSPELL_LDFLAGS@
|
aegisub_LDFLAGS += @HUNSPELL_LIBS@
|
||||||
aegisub_LDADD += libmisc_hunspell.a
|
aegisub_LDADD += libmisc_hunspell.a
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
16
configure.in
16
configure.in
|
@ -285,16 +285,16 @@ PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 2.4,
|
||||||
[AC_MSG_FAILURE([aegisub requires >= fontconfig >= 2.4])])
|
[AC_MSG_FAILURE([aegisub requires >= fontconfig >= 2.4])])
|
||||||
|
|
||||||
|
|
||||||
AC_ARG_WITH(hunspell, [ --without-hunspell build without hunspell support], hunspell_disabled="(disabled)")
|
|
||||||
if test "$with_hunspell" != "no"; then
|
|
||||||
AC_CHECK_LIB([hunspell], [main],[HUNSPELL_LDFLAGS="-lhunspell"; with_hunspell="yes"], [with_hunspell=no])
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "$with_hunspell" = "yes"; then
|
AC_ARG_WITH(hunspell, [ --without-hunspell build without hunspell support (default: auto)], hunspell_disabled="(disabled)")
|
||||||
AC_DEFINE(WITH_HUNSPELL, 1, [Enable hunspell support])
|
if test "x$with_hunspell" != xno; then
|
||||||
|
PKG_CHECK_MODULES(HUNSPELL, hunspell <= 1.1.10, [with_old_hunspell=yes], [with_old_hunspell=no])
|
||||||
|
fi
|
||||||
|
AM_CONDITIONAL([HAVE_HUNSPELL], [test "$with_old_hunspell" != "no"])
|
||||||
|
if test "$with_old_hunspell" = "yes"; then
|
||||||
|
AC_DEFINE(WITH_OLD_HUNSPELL, 1, [Enable Older Hunspell support.])
|
||||||
|
HUNSPELL_CFLAGS="$HUNSPELL_CFLAGS -DWITH_OLD_HUNSPELL"
|
||||||
fi
|
fi
|
||||||
AM_CONDITIONAL([HAVE_HUNSPELL], [test "$with_hunspell" != "no"])
|
|
||||||
AC_SUBST(HUNSPELL_LDFLAGS)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue