Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/ChangeLog,v
retrieving revision 1.416
diff -u -p -r1.416 ChangeLog
--- ChangeLog	21 Aug 2006 10:38:31 -0000	1.416
+++ ChangeLog	1 Sep 2006 12:37:52 -0000
@@ -1,3 +1,9 @@
+2006-09-01  Harish Krishnaswamy  <kharish@novell.com>
+
+	* configure.in, camel/providers/Makefile.am: 
+	Make IMAP4rev1 provider a conditional feature,
+	turned off by default. Fixes #324118.
+
 2006-08-21  Srinivasa Ragavan <sragavan@novell.com>
 
 	* configure.in, NEWS: EDS 1.7.92 release.
Index: configure.in
===================================================================
RCS file: /cvs/gnome/evolution-data-server/configure.in,v
retrieving revision 1.188
diff -u -p -r1.188 configure.in
--- configure.in	21 Aug 2006 10:38:31 -0000	1.188
+++ configure.in	1 Sep 2006 12:37:53 -0000
@@ -892,6 +892,19 @@ else
 fi
 AM_CONDITIONAL(ENABLE_IMAPP, test x$enable_imapp = xyes)
 
+dnl ************************************************** 	 
+dnl IMAP4rev1 code support. 	 
+dnl ************************************************** 	 
+ AC_ARG_ENABLE(imap4, 	 
+ [  --enable-imap4=[no/yes]      Attempt to compile yet another, incomplete, very unsupported IMAPv4r1 implementation],,enable_imap4=no) 	 
+ if test "x$enable_imap4" = "xyes"; then 	 
+         AC_DEFINE(ENABLE_IMAP4,1,[Really don't try this at home]) 	 
+         msg_imap4=yes 	 
+ else 	 
+         msg_imap4=no 	 
+ fi 	 
+ AM_CONDITIONAL(ENABLE_IMAP4, test x$enable_imap4 = xyes)
+ 
 dnl **************************************************
 dnl * File locking
 dnl **************************************************
Index: camel/providers/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/Makefile.am,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile.am
--- camel/providers/Makefile.am	14 Nov 2005 19:15:31 -0000	1.38
+++ camel/providers/Makefile.am	1 Sep 2006 12:37:53 -0000
@@ -8,11 +8,15 @@ if ENABLE_IMAPP
 IMAPP_DIR=imapp
 endif
 
+if ENABLE_IMAP4
+IMAP4_DIR=imap4
+endif
+
 if OS_WIN32
 else
 SENDMAIL_DIR=sendmail
 endif
 
-SUBDIRS = pop3 $(SENDMAIL_DIR) smtp imap imap4 $(NNTP_DIR) local $(IMAPP_DIR) groupwise hula
+SUBDIRS = pop3 $(SENDMAIL_DIR) smtp imap $(IMAP4_DIR) $(NNTP_DIR) local $(IMAPP_DIR) groupwise hula