Merge branch 'master' of pan:/git/madmutt

Conflicts:

	imap/Makefile.am

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/doconfig.sh b/doconfig.sh
index 7bf6ef8..8818647 100755 (executable)
--- a/doconfig.sh
+++ b/doconfig.sh
@@ -1,5 +1,5 @@
 ./autogen.sh
 ./configure -C --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man       \
     --with-sharedir=/usr/share/mutt-ng --with-docdir=/usr/share/doc/mutt-ng  \
-    --with-mailpath=/var/mail --enable-fcntl --with-idn --with-curses --enable-nntp --with-gss --with-gnutls          \
+    --with-mailpath=/var/mail --enable-fcntl --with-idn --with-curses --enable-nntp --with-gnutls \
     --with-libesmtp --enable-gpgme --enable-hcache --enable-doc