[ekiga] Made the LDAP code a plugin (bug #586262)

[Julien Puydt <jpuydt src gnome org>]

commit 3e78d83f888b5731e9d48f3e20998b670577a7a1
Author: Julien Puydt <jpuydt gnome org>
Date:   Wed Jul 1 20:32:04 2009 +0200

    Made the LDAP code a plugin (bug #586262)
    
    It has a limited interest, since ptlib still links to all
    the LDAP libs anyway...

 lib/engine/Makefile.am                   |    4 ----
 lib/engine/components/ldap/Makefile.am   |    8 +++-----
 lib/engine/components/ldap/ldap-main.cpp |    4 ++--
 lib/engine/engine.cpp                    |    8 --------
 4 files changed, 5 insertions(+), 19 deletions(-)
---
diff --git a/lib/engine/Makefile.am b/lib/engine/Makefile.am
index cf0ce6c..ad61394 100644
--- a/lib/engine/Makefile.am
+++ b/lib/engine/Makefile.am
@@ -137,10 +137,6 @@ libekiga_engine_la_LIBADD += \
 	$(top_builddir)/lib/engine/components/avahi-publisher/libavahipublisher.la
 endif
 
-if HAVE_LDAP
-libekiga_engine_la_LIBADD += components/ldap/libgmldap.la
-endif
-
 if HAVE_GNOME
 if HAVE_DBUS
 INCLUDES += -I$(top_srcdir)/lib/engine/components/gnome-session/
diff --git a/lib/engine/components/ldap/Makefile.am b/lib/engine/components/ldap/Makefile.am
index 56f22be..744915e 100644
--- a/lib/engine/components/ldap/Makefile.am
+++ b/lib/engine/components/ldap/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libgmldap.la
+plugin_LTLIBRARIES = libgmldap.la
 
 ldap_dir = $(top_srcdir)/lib/engine/components/ldap
 
@@ -19,7 +19,5 @@ libgmldap_la_SOURCES = \
 	$(ldap_dir)/ldap-main.h 	\
 	$(ldap_dir)/ldap-main.cpp
 
-libgmldap_la_LIBADD = \
-	$(top_builddir)/lib/engine/addressbook/libgmaddressbook.la
-
-libgmldap_la_LDFLAGS = -export-dynamic -no-undefined $(LDAP_LIBS) $(SIGC_LIBS) $(GLIB_LIBS) $(XML_LIBS)
+libgmldap_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
+libgmldap_la_LIBADD =  $(LDAP_LIBS) $(SIGC_LIBS) $(GLIB_LIBS) $(XML_LIBS)
diff --git a/lib/engine/components/ldap/ldap-main.cpp b/lib/engine/components/ldap/ldap-main.cpp
index f06d3b5..0f4ecda 100644
--- a/lib/engine/components/ldap/ldap-main.cpp
+++ b/lib/engine/components/ldap/ldap-main.cpp
@@ -75,8 +75,8 @@ struct LDAPSpark: public Ekiga::Spark
   bool result;
 };
 
-void
-ldap_init (Ekiga::KickStart& kickstart)
+extern "C" void
+ekiga_plugin_init (Ekiga::KickStart& kickstart)
 {
   gmref_ptr<Ekiga::Spark> spark(new LDAPSpark);
   kickstart.add_spark (spark);
diff --git a/lib/engine/engine.cpp b/lib/engine/engine.cpp
index c98b70e..1d8123e 100644
--- a/lib/engine/engine.cpp
+++ b/lib/engine/engine.cpp
@@ -91,10 +91,6 @@
 #include "avahi-publisher-main.h"
 #endif
 
-#ifdef HAVE_LDAP
-#include "ldap-main.h"
-#endif
-
 #ifdef HAVE_NOTIFY
 #include "libnotify-main.h"
 #endif
@@ -201,10 +197,6 @@ engine_init (int argc,
   avahi_publisher_init (kickstart);
 #endif
 
-#ifdef HAVE_LDAP
-  ldap_init (kickstart);
-#endif
-
 #ifdef HAVE_GNOME
 #ifdef HAVE_DBUS
   gnomesession_init (kickstart);