[evolution-data-server] Compile imapx always

[Chenthill Palanisamy <pchen src gnome org>]

commit 2bfbaf92d7ad1b358debbba2da989b2cd5b78703
Author: Chenthill Palanisamy <pchenthill novell com>
Date:   Thu Feb 25 17:27:58 2010 +0530

    Compile imapx always

 camel/providers/Makefile.am |    8 +-------
 configure.ac                |   26 --------------------------
 2 files changed, 1 insertions(+), 33 deletions(-)
---
diff --git a/camel/providers/Makefile.am b/camel/providers/Makefile.am
index 0bd583b..5cdbafa 100644
--- a/camel/providers/Makefile.am
+++ b/camel/providers/Makefile.am
@@ -6,10 +6,6 @@ if ENABLE_IMAP4
 IMAP4_DIR=imap4
 endif
 
-if ENABLE_IMAPX
-IMAPX_DIR=imapx
-endif
-
 if ENABLE_HULA
 HULA_DIR=hula
 endif
@@ -19,8 +15,6 @@ else
 SENDMAIL_DIR=sendmail
 endif
 
-SUBDIRS = pop3 $(SENDMAIL_DIR) smtp imap $(IMAPX_DIR) $(IMAP4_DIR) $(NNTP_DIR) local groupwise $(HULA_DIR)
-
-
+SUBDIRS = pop3 $(SENDMAIL_DIR) smtp imap imapx $(IMAP4_DIR) $(NNTP_DIR) local groupwise $(HULA_DIR)
 
 -include $(top_srcdir)/git.mk
diff --git a/configure.ac b/configure.ac
index 9e94540..1ab4c74 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1002,26 +1002,6 @@ fi
 AM_CONDITIONAL(ENABLE_IMAP4, [test x$enable_imap4 = xyes])
 
 dnl ******************************
-dnl IMAPX code support.
-dnl ******************************
-AC_ARG_ENABLE(imapx,
-	AS_HELP_STRING([--enable-imapx=no/yes],
-	[Attempt to compile yet another, incomplete, very unsupported IMAPv4r1 implementation]),
-	[],[enable_imapx=no])
-
-if test "x$enable_imapx" = "xyes"; then
-	AC_DEFINE(ENABLE_IMAPX,1,[Really don't try this at home])
-	AC_PATH_PROG(GPERF, gperf)
-	if test -z "$GPERF" ; then
-		AC_MSG_ERROR([You need gperf to compile imapx provider])
-	fi
-	msg_imapx="yes"
-else
-	msg_imapx="no"
-fi
-AM_CONDITIONAL(ENABLE_IMAPX, [test x$enable_imapx = xyes])
-
-dnl ******************************
 dnl Hula support
 dnl ******************************
 AC_ARG_ENABLE([hula],
@@ -1548,9 +1528,3 @@ echo "
 if test "x$msg_hula" = "xyes"; then
 	echo "Hula support:	$msg_hula"
 fi
-
-if test "x$msg_imapx" = "xyes"; then
-	echo "
-	IMAPX support:		$msg_imapx
-"
-fi