add LDAP_LIBS here.

	* wombat/Makefile.am (wombat_LDADD): add LDAP_LIBS here.

	* configure.in: check for -lldap and -llber and if both are
	present include ldap support in the pas/wombat.

	* addressbook/backend/pas/Makefile.am (libpas_la_SOURCES): include
	pas-backend.ldap.c if ENABLE_LDAP.

	* addressbook/backend/pas/pas-backend-ldap.c: get searching
	working (converting between the sexp and ldap stuff.)

	* wombat/wombat.c (setup_pas): register the ldap pas backend if
	HAVE_LDAP is defined.

svn path=/trunk/; revision=2401

2 files changed, 9 insertions, 1 deletions

diff --git a/wombat/Makefile.am b/wombat/Makefile.am
index 6ab086d667..002ce7d355 100644
--- a/wombat/Makefile.am
+++ b/wombat/Makefile.am
@@ -25,7 +25,7 @@ wombat_LDADD =				\
 	$(top_builddir)/calendar/cal-util/libcalutil.la     	\
 	$(top_builddir)/libversit/libversit.la 			\
 	$(top_builddir)/e-util/libeutil.la     			\
-	-lgnomevfs
+	-lgnomevfs $(LDAP_LIBS)
 
 wombat_LDFLAGS = `gnome-config --libs gnorba` 
 
diff --git a/wombat/wombat.c b/wombat/wombat.c
index 5e4ad25173..989df9b484 100644
--- a/wombat/wombat.c
+++ b/wombat/wombat.c
@@ -9,6 +9,9 @@
 #include <bonobo.h>
 #include <pas-book-factory.h>
 #include <pas-backend-file.h>
+#ifdef HAVE_LDAP
+#include <pas-backend-ldap.h>
+#endif
 #include <libgnomevfs/gnome-vfs-init.h>
 #include <libgnorba/gnorba.h>
 #include <cal-factory.h>
@@ -27,6 +30,11 @@ setup_pas (int argc, char **argv)
 	pas_book_factory_register_backend (
 		factory, "file", pas_backend_file_new);
 
+#ifdef HAVE_LDAP
+	pas_book_factory_register_backend (
+		factory, "ldap", pas_backend_ldap_new);
+#endif
+
 	pas_book_factory_activate (factory);
 }