--- configure.in.orig	2008-07-01 20:17:21.000000000 +0200
+++ configure.in	2008-09-02 17:36:29.000000000 +0200
@@ -22,6 +22,35 @@
     dovecot_sievedir=../dovecot-sieve-1.1
 )
 
+AC_ARG_WITH(libwrap,
+[  --with-libwrap          Build with libwrap, ie. TCP-wrappers (default)],
+    if test x$withval = xno; then
+		want_libwrap=no
+	else
+		want_libwrap=yes
+	fi,
+	want_libwrap=yes)
+
+if test "$want_libwrap" = "yes"; then
+  AC_CHECK_HEADER(tcpd.h, [
+    old_LIBS=$LIBS
+    LIBS="$LIBS -lwrap"
+    AC_TRY_LINK([
+      #include <tcpd.h>
+      int allow_severity;
+      int deny_severity;
+      struct request_info request;
+    ], [
+      request_init(&request, 0);
+    ], [
+      AC_DEFINE(HAVE_LIBWRAP,, Define if you have libwrap)
+      LIBWRAP_LIBS=-lwrap
+      AC_SUBST(LIBWRAP_LIBS)
+    ])
+    LIBS=$old_LIBS
+  ])
+fi
+
 top=`pwd`
 cd $dovecotdir
 dovecotdir=`pwd`
--- src/managesieve-login/Makefile.am.orig	2008-07-01 20:17:21.000000000 +0200
+++ src/managesieve-login/Makefile.am	2008-09-02 17:38:23.000000000 +0200
@@ -25,7 +25,8 @@
 	$(dovecot_incdir)/src/lib-charset/libcharset.a \
 	$(dovecot_incdir)/src/lib-auth/libauth.a \
 	$(dovecot_incdir)/src/lib/liblib.a \
-	$(SSL_LIBS)
+	$(SSL_LIBS) \
+	$(LIBWRAP_LIBS)
 
 managesieve_login_SOURCES = \
 	client.c \