commit 097f550a8391bd680c1a8aed2e190b7abdc0c4cf
parent f5196abff7208ca61542b6e0c8e07052b2eeb82e
Author: Paul Mangan <paul@claws-mail.org>
Date: Fri, 12 Sep 2008 06:13:11 +0000
2008-09-12 [paul] 3.5.0cvs100
* configure.ac
revert cvs99's libenchant commit error
Diffstat:
3 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-12 [paul] 3.5.0cvs100
+
+ * configure.ac
+ revert cvs99's libenchant commit error
+
2008-09-12 [colin] 3.5.0cvs99
* src/inc.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3511,3 +3511,4 @@
( cvs diff -u -r 1.382.2.472 -r 1.382.2.473 src/compose.c; ) > 3.5.0cvs97.patchset
( cvs diff -u -r 1.149.2.92 -r 1.149.2.93 src/inc.c; cvs diff -u -r 1.395.2.390 -r 1.395.2.391 src/summaryview.c; cvs diff -u -r 1.23.2.18 -r 1.23.2.19 src/common/session.c; ) > 3.5.0cvs98.patchset
( cvs diff -u -r 1.149.2.93 -r 1.149.2.94 src/inc.c; ) > 3.5.0cvs99.patchset
+( cvs diff -u -r 1.654.2.3573 -r 1.654.2.3574 configure.ac; ) > 3.5.0cvs100.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=99
+EXTRA_VERSION=100
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
@@ -460,24 +460,17 @@ AC_ARG_ENABLE(deprecated, [ --disable-deprecated disable deprecated GTK functi
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
-dnl enchant is used for spell checking
-AC_ARG_ENABLE(enchant,
- [ --disable-enchant disable enchant support],
- [ac_cv_enable_enchant=$enableval], [ac_cv_enable_enchant=yes])
-AC_MSG_CHECKING([whether to use enchant])
-if test $ac_cv_enable_enchant = yes; then
- PKG_CHECK_MODULES(ENCHANT, enchant >= 1.0.0,
- [
- AC_DEFINE(USE_ENCHANT, 1, enchant)
- echo "Building with enchant"
- ac_cv_enable_enchant=yes
- ],
- [
- echo "Building without enchant-notification"
- ac_cv_enable_enchant=no
- ])
- AC_SUBST(ENCHANT_CFLAGS)
- AC_SUBST(ENCHANT_LIBS)
+dnl GNU/Aspell is used for spell checking
+AC_ARG_ENABLE(aspell,
+ [ --disable-aspell disable GNU/aspell support],
+ [ac_cv_enable_aspell=$enableval], [ac_cv_enable_aspell=yes])
+AC_MSG_CHECKING([whether to use GNU/aspell])
+if test $ac_cv_enable_aspell = yes; then
+ AC_MSG_RESULT(yes)
+ AM_PATH_ASPELL(0.50, AC_DEFINE(USE_ASPELL, 1, Define if you use ASPELL to support spell checking),
+ [use_aspell=no ac_cv_enable_aspell=no])
+else
+ AC_MSG_RESULT(no)
fi
dnl want crash dialog
@@ -1072,7 +1065,7 @@ echo "gnuTLS : $ac_cv_enable_gnutls"
echo "iconv : $am_cv_func_iconv"
echo "compface : $ac_cv_enable_compface"
echo "IPv6 : $ac_cv_enable_ipv6"
-echo "enchant : $ac_cv_enable_enchant"
+echo "GNU/aspell : $ac_cv_enable_aspell"
echo "IMAP4 : $ac_cv_enable_libetpan"
echo "NNTP : $ac_cv_enable_libetpan"
echo "Crash dialog : $ac_cv_enable_crash_dialog"
