From 447a71143fe9ced006da874853bc83aba2e246da Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 28 Nov 2009 16:54:41 -0500 Subject: Rewrite champlain-gtk and geoclue detection. Disabling desktop integration features must be explicit. If experimental plugins are enabled and unless --disable-contacts-map is given, configuration will fail if champlain-gtk or geoclue is missing. --- plugins/contacts-map/Makefile.am | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'plugins/contacts-map') diff --git a/plugins/contacts-map/Makefile.am b/plugins/contacts-map/Makefile.am index 91ff22c0bc..4c3585620c 100644 --- a/plugins/contacts-map/Makefile.am +++ b/plugins/contacts-map/Makefile.am @@ -1,15 +1,16 @@ -AM_CPPFLAGS = \ +@EVO_PLUGIN_RULE@ + +plugin_DATA = org-gnome-contacts-map.eplug +plugin_LTLIBRARIES = liborg-gnome-contacts-map.la + +liborg_gnome_contacts_map_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ $(CHAMPLAIN_CFLAGS) \ $(GEOCLUE_CFLAGS) -@EVO_PLUGIN_RULE@ - -plugin_DATA = org-gnome-contacts-map.eplug -plugin_LTLIBRARIES = liborg-gnome-contacts-map.la - liborg_gnome_contacts_map_la_SOURCES = \ contacts-map.c \ geo-utils.c \ @@ -23,7 +24,7 @@ liborg_gnome_contacts_map_la_LIBADD = \ $(GEOCLUE_LIBS) \ $(EVOLUTION_ADDRESSBOOK_LIBS) -EXTRA_DIST = org-gnome-contacts-maps.eplug.xml +EXTRA_DIST = org-gnome-contacts-map.eplug.xml BUILT_SOURCES = $(plugin_DATA) CLEANFILES = $(BUILT_SOURCES) -- cgit v1.2.3