* #5659 : addressbook doesn't use libedataserverui

plugins/addressbook/evolution/Makefile.am

@@ -4,11 +4,11 @@ noinst_PROGRAMS = libevladdrbook.so
 
 libevladdrbook_so_SOURCES = eds.c eds.h addressbook.c addressbook.h
 
-libevladdrbook_so_LDFLAGS = --shared $(SFLGLIB_LDFLAGS) $(SFLGTK_LDFLAGS) $(LIBEDATASERVER_LDFLAGS) $(LIBEDATASERVERUI_LDFLAGS) $(LIBEBOOK_LDFLAGS)
+libevladdrbook_so_LDFLAGS = --shared $(GLIB_LDFLAGS) $(GTK_LDFLAGS) $(LIBEDATASERVER_LDFLAGS) $(LIBEBOOK_LDFLAGS)
 
-libevladdrbook_so_LDADD = $(SFLGLIB_LIBS) $(SFLGTK_LIBS) $(LIBEDATASERVER_LIBS) $(LIBEDATASERVERUI_LIBS) $(LIBEBOOK_LIBS)
+libevladdrbook_so_LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(LIBEDATASERVER_LIBS) $(LIBEBOOK_LIBS)
 
-libevladdrbook_so_CFLAGS = -fPIC -g -Wall $(SFLGTK_CFLAGS) $(LIBEDATASERVER_CFLAGS) $(LIBEDATASERVERUI_CFLAGS) $(LIBEBOOK_CFLAGS) 
+libevladdrbook_so_CFLAGS = -fPIC -g -Wall $(GTK_CFLAGS) $(LIBEDATASERVER_CFLAGS) $(LIBEBOOK_CFLAGS)
 
 install-exec-local: install-libplugin_libevladdrbook_so
 
@@ -20,4 +20,4 @@ install-libplugin_libevladdrbook_so: libevladdrbook.so
 
 uninstall-libplugin_libevladdrbook_so:
 	rm -f $(sflplugindir)/libevladdrbook.so
-	rm -rf $(sflplugindir)
+	rmdir $(sflplugindir)

plugins/configure.ac

@@ -29,8 +29,8 @@ LT_INIT
 dnl GCONF utilities
 AM_GCONF_SOURCE_2
 
-PKG_CHECK_MODULES(SFLGTK, gtk+-2.0 > 2.2)
-PKG_CHECK_MODULES(SFLGLIB, glib-2.0 >= 2.2)
+PKG_CHECK_MODULES(GTK, gtk+-2.0 > 2.2)
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.2)
 PKG_CHECK_MODULES(LIBEBOOK, libebook-1.2 >= 1.4)
 PKG_CHECK_MODULES([LIBEDATASERVER], [libedataserver-1.2 >= 2.32],
         [AC_DEFINE([LIBEDATASERVER_VERSION_2_32], [], [Using libedataserver-1.2 version 2.32 or higher])],