--- src/libsieve/Makefile.in.orig	2007-09-23 16:59:48.000000000 +0200
+++ src/libsieve/Makefile.in
@@ -38,8 +38,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@HAVE_DOVECOT_LIBS_TRUE@pkglibexec_PROGRAMS = sievec$(EXEEXT) \
-@HAVE_DOVECOT_LIBS_TRUE@	sieved$(EXEEXT)
+pkglibexec_PROGRAMS = sievec$(EXEEXT) \
+	sieved$(EXEEXT)
 subdir = src/libsieve
 DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in AUTHORS COPYING ChangeLog NEWS \
@@ -62,17 +62,21 @@ am__installdirs = "$(DESTDIR)$(pkglibexe
 pkglibexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(pkglibexec_PROGRAMS)
 am__sievec_SOURCES_DIST = sievec.c ../map.c ../imparse.c
-@HAVE_DOVECOT_LIBS_TRUE@am_sievec_OBJECTS = sievec.$(OBJEXT) \
-@HAVE_DOVECOT_LIBS_TRUE@	map.$(OBJEXT) imparse.$(OBJEXT)
+am_sievec_OBJECTS = sievec.$(OBJEXT) \
+	map.$(OBJEXT) imparse.$(OBJEXT)
 sievec_OBJECTS = $(am_sievec_OBJECTS)
 @HAVE_DOVECOT_LIBS_TRUE@sievec_DEPENDENCIES = libsieve.la \
 @HAVE_DOVECOT_LIBS_TRUE@	$(dovecotdir)/src/lib/liblib.a
+@HAVE_DOVECOT_LIBS_FALSE@sievec_DEPENDENCIES = libsieve.la \
+@HAVE_DOVECOT_LIBS_FALSE@	$(dovecotdir)/liblib.a
 am__sieved_SOURCES_DIST = sieved.c ../map.c ../imparse.c
-@HAVE_DOVECOT_LIBS_TRUE@am_sieved_OBJECTS = sieved.$(OBJEXT) \
-@HAVE_DOVECOT_LIBS_TRUE@	map.$(OBJEXT) imparse.$(OBJEXT)
+am_sieved_OBJECTS = sieved.$(OBJEXT) \
+	map.$(OBJEXT) imparse.$(OBJEXT)
 sieved_OBJECTS = $(am_sieved_OBJECTS)
 @HAVE_DOVECOT_LIBS_TRUE@sieved_DEPENDENCIES = libsieve.la \
 @HAVE_DOVECOT_LIBS_TRUE@	$(dovecotdir)/src/lib/liblib.a
+@HAVE_DOVECOT_LIBS_FALSE@sieved_DEPENDENCIES = libsieve.la \
+@HAVE_DOVECOT_LIBS_FALSE@	$(dovecotdir)/liblib.a
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -267,10 +271,16 @@ noinst_HEADERS = \
 @HAVE_DOVECOT_LIBS_TRUE@sievec_LDADD = \
 @HAVE_DOVECOT_LIBS_TRUE@	libsieve.la \
 @HAVE_DOVECOT_LIBS_TRUE@	$(dovecotdir)/src/lib/liblib.a
+@HAVE_DOVECOT_LIBS_FALSE@sievec_LDADD = \
+@HAVE_DOVECOT_LIBS_FALSE@	libsieve.la \
+@HAVE_DOVECOT_LIBS_FALSE@	$(dovecotdir)/liblib.a
 
 @HAVE_DOVECOT_LIBS_TRUE@sieved_LDADD = \
 @HAVE_DOVECOT_LIBS_TRUE@	libsieve.la \
 @HAVE_DOVECOT_LIBS_TRUE@	$(dovecotdir)/src/lib/liblib.a
+@HAVE_DOVECOT_LIBS_FALSE@sieved_LDADD = \
+@HAVE_DOVECOT_LIBS_FALSE@	libsieve.la \
+@HAVE_DOVECOT_LIBS_FALSE@	$(dovecotdir)/liblib.a
 
 @HAVE_DOVECOT_LIBS_FALSE@notbuilt_sources = sievec.c sieved.c
 @HAVE_DOVECOT_LIBS_TRUE@notbuilt_sources =