--- Makefile.in.orig	2003-10-20 23:36:25.000000000 +0100
+++ Makefile.in	2003-10-23 19:12:23.000000000 +0100
@@ -70,7 +70,7 @@
 
 SUBDIRS = mysql pgsql
 
-bin_PROGRAMS = dbmail-smtp dbmail-pop3d dbmail-imapd dbmail-maintenance dbmail-adduser dbmail-readvut raw-convertor dbmail-mini-injector
+bin_PROGRAMS = dbmail-smtp dbmail-pop3d dbmail-imapd dbmail-maintenance dbmail-adduser dbmail-readvut raw-convertor dbmail-mini-injector dbmail-ximapd
 bin_SCRIPTS = install-dbmail.sh
 
 dbmail_smtp_SOURCES = config.c list.c debug.c dbmd5.c md5.c mime.c main.c pipe.c bounce.c forward.c memblock.c misc.c
@@ -85,6 +85,10 @@
 dbmail_imapd_LDADD = @SQLALIB@
 dbmail_imapd_LDFLAGS = @SQLLIB@
 
+dbmail_ximapd_SOURCES = quota.c config.c server.c serverchild.c imap4.c debug.c list.c dbmd5.c md5.c imaputil.c imapcommands.c mime.c misc.c memblock.c rfcmsg.c imapd.c ximap.c
+dbmail_ximapd_LDADD = @SQLALIB@
+dbmail_ximapd_LDFLAGS = @SQLLIB@
+
 dbmail_maintenance_SOURCES = config.c debug.c list.c dbmd5.c md5.c mime.c memblock.c maintenance.c auth.h
 dbmail_maintenance_LDADD = @SQLALIB@
 dbmail_maintenance_LDFLAGS = @SQLLIB@
@@ -138,6 +142,10 @@
 debug.o list.o dbmd5.o md5.o imaputil.o imapcommands.o mime.o misc.o \
 memblock.o rfcmsg.o imapd.o
 dbmail_imapd_DEPENDENCIES = 
+dbmail_ximapd_OBJECTS =  quota.o config.o server.o serverchild.o imap4.o \
+debug.o list.o dbmd5.o md5.o imaputil.o imapcommands.o mime.o misc.o \
+memblock.o rfcmsg.o ximapd.o
+dbmail_ximapd_DEPENDENCIES =
 dbmail_maintenance_OBJECTS =  config.o debug.o list.o dbmd5.o md5.o \
 mime.o memblock.o maintenance.o
 dbmail_maintenance_DEPENDENCIES = 
@@ -174,9 +182,9 @@
 .deps/md5.P .deps/memblock.P .deps/mime.P .deps/mini-injector.P \
 .deps/misc.P .deps/pipe.P .deps/pop3.P .deps/pop3d.P .deps/quota.P \
 .deps/raw-convert.P .deps/rfcmsg.P .deps/server.P .deps/serverchild.P \
-.deps/user.P .deps/vut2dbmail.P
-SOURCES = $(dbmail_smtp_SOURCES) $(dbmail_pop3d_SOURCES) $(dbmail_imapd_SOURCES) $(dbmail_maintenance_SOURCES) $(dbmail_adduser_SOURCES) $(dbmail_readvut_SOURCES) $(raw_convertor_SOURCES) $(dbmail_mini_injector_SOURCES)
-OBJECTS = $(dbmail_smtp_OBJECTS) $(dbmail_pop3d_OBJECTS) $(dbmail_imapd_OBJECTS) $(dbmail_maintenance_OBJECTS) $(dbmail_adduser_OBJECTS) $(dbmail_readvut_OBJECTS) $(raw_convertor_OBJECTS) $(dbmail_mini_injector_OBJECTS)
+.deps/user.P .deps/vut2dbmail.P ./deps/ximapd.P
+SOURCES = $(dbmail_smtp_SOURCES) $(dbmail_pop3d_SOURCES) $(dbmail_imapd_SOURCES) $(dbmail_maintenance_SOURCES) $(dbmail_adduser_SOURCES) $(dbmail_readvut_SOURCES) $(raw_convertor_SOURCES) $(dbmail_mini_injector_SOURCES) $(dbmail_ximapd_SOURCE)
+OBJECTS = $(dbmail_smtp_OBJECTS) $(dbmail_pop3d_OBJECTS) $(dbmail_imapd_OBJECTS) $(dbmail_maintenance_OBJECTS) $(dbmail_adduser_OBJECTS) $(dbmail_readvut_OBJECTS) $(raw_convertor_OBJECTS) $(dbmail_mini_injector_OBJECTS) $(dbmail_ximapd_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
@@ -277,6 +285,10 @@
 	@rm -f dbmail-imapd
 	$(LINK) $(dbmail_imapd_LDFLAGS) $(dbmail_imapd_OBJECTS) $(dbmail_imapd_LDADD) $(LIBS)
 
+dbmail-ximapd: $(dbmail_ximapd_OBJECTS) $(dbmail_ximapd_DEPENDENCIES)
+	@rm -f dbmail-ximapd
+	$(LINK) $(dbmail_ximapd_LDFLAGS) $(dbmail_ximapd_OBJECTS) $(dbmail_ximapd_LDADD) $(LIBS)
+
 dbmail-maintenance: $(dbmail_maintenance_OBJECTS) $(dbmail_maintenance_DEPENDENCIES)
 	@rm -f dbmail-maintenance
 	$(LINK) $(dbmail_maintenance_LDFLAGS) $(dbmail_maintenance_OBJECTS) $(dbmail_maintenance_LDADD) $(LIBS)