[balsa] Release balsa-2.4.6

[Pawel Salek <pawels src gnome org>]

commit 4d345b52fedbe9a7dbcde9ca1967ce406becb243
Author: Pawel Salek <pawsa damage localdomain>
Date:   Wed Jan 27 22:18:15 2010 +0100

    Release balsa-2.4.6

 ChangeLog    |    4 ++++
 NEWS         |    6 ++++++
 configure.in |   10 ++++++----
 3 files changed, 16 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 9f6a722..6bc3f0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-27  Pawel Salek
+
+	* configure.in, NEWS: release 2.4.6.
+
 2010-01-25  Pawel Salek
 
 	* libbalsa/imap/siobuf.c: fix occassional sio_ungetc() failures
diff --git a/NEWS b/NEWS
index 53382df..e2a578f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+* Balsa-2.4.6 release. Release date 2010-01-27
+
+Clearly, 2.4.3 to 2.4.5 were of a release-candidate quality...
+- add forgotten part of filter comparison patch.
+- fix occasional IMAP failures on compressed connections.
+
 * Balsa-2.4.5 release. Release date 2010-01-24
 
 - fix building with GNOME.
diff --git a/configure.in b/configure.in
index add2091..a85d3a3 100644
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ dnl ###########################################################################
 
 BALSA_MAJOR=2
 BALSA_REVISION=4
-BALSA_PATCHLEVEL=5
+BALSA_PATCHLEVEL=6
 BALSA_VERSION="$BALSA_MAJOR.$BALSA_REVISION.${BALSA_PATCHLEVEL}"
 
 AC_SUBST(BALSA_MAJOR)
@@ -383,7 +383,6 @@ if test x"$use_webkit" != xno ; then
     BALSA_CFLAGS="$BALSA_CFLAGS $WEBKIT_CFLAGS"
     BALSA_LIBS="$BALSA_LIBS $WEBKIT_LIBS"
     BALSA_AB_LIBS="$BALSA_AB_LIBS $WEBKIT_LIBS"
-    use_gtkhtml=no
 else
     AC_MSG_RESULT([no])
 fi
@@ -391,6 +390,9 @@ fi
 # GtkHtml library.
 #
 if test x"$use_gtkhtml" != xno ; then
+    if test x"$use_webkit" != xno ; then
+        AC_MSG_ERROR([--with-webkit and --with-gtkhtml are mutually exclusive.])
+    fi
     case "$use_gtkhtml" in
      2) check_pkgs="2.0 3.14 3.8 3.6 3.1 3.0";;
      *) check_pkgs="3.14 3.8 3.6 3.1 3.0 2.0";;
@@ -886,7 +888,7 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
         unset option
 fi
 
-# extra warnings for Subversion.
+# extra warnings for GIT.
 #
 
 if test -d "${srcdir}/.git" ; then
@@ -912,7 +914,7 @@ else
 	BALSA_FROM_GIT=no
 fi
 
-AC_MSG_CHECKING([for Subversion information])
+AC_MSG_CHECKING([for GIT information])
 AC_MSG_RESULT($BALSA_FROM_GIT)
 
 dnl #####################################################################