[dovecot-cvs] dovecot configure.in,1.277.2.11,1.277.2.12

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot
In directory talvi:/tmp/cvs-serv30230

Modified Files:
      Tag: branch_1_0
	configure.in 
Log Message:
Include linux/unistd.h instead of asm/unistd.h when checking for epoll.



Index: configure.in
===================================================================
RCS file: /var/lib/cvs/dovecot/configure.in,v
retrieving revision 1.277.2.11
retrieving revision 1.277.2.12
diff -u -d -r1.277.2.11 -r1.277.2.12
--- configure.in	17 Jun 2006 19:32:13 -0000	1.277.2.11
+++ configure.in	18 Jun 2006 00:24:52 -0000	1.277.2.12
@@ -377,7 +377,7 @@
     #include <sys/epoll.h>
     #include <errno.h>
 
-    #include <asm/unistd.h>
+    #include <linux/unistd.h>
     
     _syscall1 (int, epoll_create, int, size)
 
@@ -1666,13 +1666,21 @@
 dbox_libs='$(top_builddir)/src/lib-storage/index/dbox/libstorage_dbox.a'
 index_libs='$(top_builddir)/src/lib-storage/index/libstorage_index.a $(top_builddir)/src/lib-index/libindex.a'
 
+deliver_storage="mbox"
 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="$STORAGE_LIBS $index_libs"
 AC_SUBST(STORAGE_LIBS)
 
+if test -n "$deliver_storage" && test "$want_deliver" = yes; then
+  AC_ERROR([If you remove mbox from storages, you need to build --without-deliver])
+fi
+
 dnl **
 dnl ** SQL drivers
 dnl **
@@ -1760,7 +1768,7 @@
 echo "Building with SSL support ........... : $have_ssl"
 echo "Building with IPv6 support .......... : $want_ipv6"
 echo "Building with pop3 server ........... : $want_pop3d"
-#echo "Building with mail delivery agent  .. : $want_deliver"
+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"