# HG changeset patch
# User Timo Sirainen <tss@iki.fi>
# Date 1246139396 14400
# Node ID 8a2c85c418a14c5b3d32d8ac0c15f39af65dcdda
# Parent  af28db3176cfa87c52625badeecd38808426fca0
Removed configure --with-deliver and --with-pop3d parameters.
If you don't want them, just don't use them. There are a lot of other
useless binaries also being compiled.

diff -r af28db3176cf -r 8a2c85c418a1 configure.in
--- a/configure.in	Thu Jun 25 13:26:10 2009 -0400
+++ b/configure.in	Sat Jun 27 17:49:56 2009 -0400
@@ -243,26 +243,14 @@
   TEST_WITH(gc, $withval),
   want_gc=no)
 
-AC_ARG_WITH(pop3d,
-[  --with-pop3d            Build POP3 server (default)],
-  TEST_WITH(pop3d, $withval),
-  want_pop3d=yes)
-AM_CONDITIONAL(BUILD_POP3D, test "$want_pop3d" = "yes")
-
-AC_ARG_WITH(deliver,
-[  --with-deliver          Build mail delivery agent (default)],
-  TEST_WITH(deliver, $withval),
-  want_deliver=yes)
-AM_CONDITIONAL(BUILD_DELIVER, test "$want_deliver" != "no")
-
 AC_ARG_WITH(storages,
 [  --with-storages         Build with specified mail storage formats
-                          (maildir mbox dbox cydir raw)], [
+                          (maildir mbox dbox cydir)], [
 	if test "$withval" = "yes" || test "$withval" = "no"; then
 		AC_MSG_ERROR([--with-storages needs storage list as parameter])
 	fi
 	mail_storages="shared `echo "$withval"|sed 's/,/ /g'`" ],
-	mail_storages="shared maildir mbox dbox cydir raw")
+	mail_storages="shared maildir mbox dbox cydir")
 AC_SUBST(mail_storages)
 
 AC_ARG_WITH(sql-drivers,
@@ -2241,22 +2229,15 @@
 '$(top_builddir)/src/lib-charset/libcharset.a '\
 '$(top_builddir)/src/lib/liblib.a'
 
-deliver_storage="raw"
+mail_storages="$mail_storages raw"
 STORAGE_LIBS=
 for storage in $mail_storages; do
-  if test "$storage" = "$deliver_storage"; then
-    deliver_storage=""
-  fi
   STORAGE_LIBS="$STORAGE_LIBS `eval echo \\$${storage}_libs`"
 done
 STORAGE_LIBS="$REGISTER_LIBS $STORAGE_LIBS $CORE_LIBS"
 AC_SUBST(STORAGE_LIBS)
 AC_DEFINE_UNQUOTED(MAIL_STORAGES, "$mail_storages", List of compiled in mail storages)
 
-if test -n "$deliver_storage" && test "$want_deliver" != no; then
-  AC_ERROR([If you remove raw from storages, you need to build --without-deliver])
-fi
-
 dnl **
 dnl ** SQL drivers
 dnl **
@@ -2453,8 +2434,6 @@
 echo "File change notification method ..... : $have_notify"
 echo "Building with SSL support ........... : $have_ssl"
 echo "Building with IPv6 support .......... : $have_ipv6"
-echo "Building with pop3 server ........... : $want_pop3d"
-echo "Building with mail delivery agent  .. : $want_deliver"
 echo "Building with GSSAPI support ........ : $have_gssapi"
 echo "Building with user database modules . :$userdb"
 echo "Building with password lookup modules :$passdb"
diff -r af28db3176cf -r 8a2c85c418a1 src/Makefile.am
--- a/src/Makefile.am	Thu Jun 25 13:26:10 2009 -0400
+++ b/src/Makefile.am	Sat Jun 27 17:49:56 2009 -0400
@@ -1,11 +1,3 @@
-if BUILD_POP3D
-POP3D = pop3-login pop3
-endif
-
-if BUILD_DELIVER
-DELIVER = deliver
-endif
-
 SUBDIRS = \
 	lib \
 	lib-dict \
@@ -25,8 +17,9 @@
 	login-common \
 	imap-login \
 	imap \
-	$(POP3D) \
-	$(DELIVER) \
+	pop3-login \
+	pop3 \
+	deliver \
 	tests \
 	util \
 	plugins