diff -ur srctree-orig/configure.in srctree-new/configure.in
--- srctree-orig/configure.in	2004-04-25 16:13:56.000000000 +0200
+++ srctree-new/configure.in	2004-04-26 01:04:59.470965290 +0200
@@ -551,6 +551,34 @@
 # saslauthd configure script --help
 AC_ARG_WITH(ldap,   [  --with-ldap=DIR         use LDAP (in DIR) for saslauthd [no] ],,)
 
+# hack in support for ldapdb plugin
+AC_ARG_ENABLE(ldapdb, [  --enable-ldapdb         enable ldapdb auxprop plugin [no]],
+	ldapdb=$enableval,
+	ldapdb=no)
+
+AC_MSG_CHECKING(LDAPDB)
+if test "$ldapdb" != no; then
+
+	SASL_MECHS="$SASL_MECHS libldapdb.la"
+  if test "$enable_static" = yes; then
+    SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/ldapdb.o"
+    AC_DEFINE(STATIC_LDAP,[],[Link LDAP plugin staticly])
+  fi
+	AC_MSG_RESULT(enabled)
+else
+	AC_MSG_RESULT(disabled)
+fi
+
+LDAP_LIBS=""
+if test "$ldapdb" != no; then
+  AC_CHECK_LIB(ldap, ldap_initialize, [ AC_DEFINE(HAVE_LDAP,[],[Support for LDAP?])
+                                        LDAP_LIBS="-lldap -llber"
+          if test "$with_openssl" != "no"; then
+              LDAP_LIBS="$LDAP_LIBS -lcrypto $LIB_RSAREF"
+          fi],,-llber)
+
+fi
+AC_SUBST(LDAP_LIBS)
 
 dnl SQL
 dnl This flag also changes the requirements of --with-mysql and --with-pgsql
diff -ur srctree-orig/plugins/Makefile.am srctree-new/plugins/Makefile.am
--- srctree-orig/plugins/Makefile.am	2004-04-25 16:14:01.000000000 +0200
+++ srctree-new/plugins/Makefile.am	2004-04-26 01:05:07.860036402 +0200
@@ -52,6 +52,7 @@
 gssapiv2_version = 2:20:0
 crammd5_version = 2:20:0
 sasldb_version = 2:20:0
+ldapdb_version = 2:20:0
 login_version = 2:20:0
 plain_version = 2:20:0
 ntlm_version = 2:20:0
@@ -59,6 +60,7 @@
 sql_version = 2:20:0
 srp_version = 2:20:0
 
+
 INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include
 AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir)
 
@@ -68,6 +70,7 @@
 noinst_SCRIPTS = makeinit.sh
 
 LIB_MYSQL = @LIB_MYSQL@
+LDAP_LIBS = @LDAP_LIBS@
 
 plugindir = @plugindir@
 
@@ -77,7 +80,7 @@
 sasl_LTLIBRARIES = @SASL_MECHS@
 EXTRA_LTLIBRARIES = libplain.la libanonymous.la libkerberos4.la libcrammd5.la \
 	libgssapiv2.la libdigestmd5.la liblogin.la libsrp.la libotp.la \
-	libntlm.la libsasldb.la libsql.la
+	libntlm.la libsasldb.la libldapdb.la libsql.la
 
 libplain_la_SOURCES = plain.c plain_init.c $(common_sources)
 libplain_la_LDFLAGS = -version-info $(plain_version)
@@ -135,6 +138,11 @@
 libsasldb_la_DEPENDENCIES = $(COMPAT_OBJS)
 libsasldb_la_LIBADD = ../sasldb/libsasldb.la $(SASL_DB_LIB) $(COMPAT_OBJS)
 
+libldapdb_la_SOURCES = ldapdb.c $(common_sources)
+libldapdb_la_LDFLAGS = $(LDAP_LIBS) -version-info $(ldapdb_version)
+libldapdb_la_DEPENDENCIES = $(COMPAT_OBJS)
+libldapdb_la_LIBADD = $(COMPAT_OBJS)
+
 libsql_la_SOURCES = sql.c sql_init.c $(common_sources)
 libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) -version-info $(sql_version)
 libsql_la_DEPENDENCIES = $(COMPAT_OBJS)