callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rewrite champlain-gtk and geoclue detection.

Browse Source 
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.
This commit is contained in:
Matthew Barnes
2009-11-28 16:54:41 -05:00
parent 7005a8dcdc
commit 447a71143f
2 changed files with 43 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
configure.ac
View File

@ -1157,28 +1157,6 @@ dnl ********************************
FULL_GNOME_DEPS="gconf-2.0 gthread-2.0 gobject-2.0"
dnl ******************************
dnl libchamplain and geoclue?
dnl ******************************
PKG_CHECK_MODULES( [CHAMPLAIN], [champlain-gtk-0.5 >= champlain_minimum_version], [HAVE_CHAMPLAIN="yes"], [HAVE_CHAMPLAIN="no"] )
if test "x$HAVE_CHAMPLAIN" = "xno"; then
PKG_CHECK_MODULES( [CHAMPLAIN], [champlain-gtk-0.4 >= champlain_minimum_version], [HAVE_CHAMPLAIN="yes"], [HAVE_CHAMPLAIN="no"] )
fi
PKG_CHECK_MODULES( [GEOCLUE], [geoclue >= geoclue_minimum_version], [HAVE_GEOCLUE="yes"], [HAVE_GEOCLUE="no"] )
if test "x$HAVE_CHAMPLAIN" = "xyes" -a "x$HAVE_GEOCLUE" = "xyes"; then
AC_DEFINE( HAVE_CHAMPLAIN, 1, [champlain-gtk available] )
CHAMPLAIN_REQUIREMENTS="champlain-gtk"
AC_DEFINE( HAVE_GEOCLUE, 1, [geoclue available] )
GEOCLUE_REQUIREMENTS="geoclue"
CONTACTS_MAP="contacts-map"
else
CHAMPLAIN_REQUIREMENTS=""
GEOCLUE_REQUIREMENTS=""
CONTACTS_MAP=""
fi
dnl ******************************
dnl TNEF implementation
dnl ******************************
@ -1551,6 +1529,41 @@ if test "x$enable_weather" = "xyes"; then
fi
fi
dnl ******************************************************
dnl contacts-map plugin requires champlain-gtk and geoclue
dnl N.B. The plugin is experimental so only require these
dnl packages if we are building experimental plugins.
dnl ******************************************************
if test "x$enable_plugins" = "xexperimental"; then
AC_ARG_ENABLE([contacts-map],
[AS_HELP_STRING([--enable-contacts-map],
[Enable contacts-map plugin @<:@default=yes@:>@])],
[enable_contacts_map="$enableval"], [enable_contacts_map=yes])
if test "x$enable_contacts_map" = "xyes"; then
PKG_CHECK_MODULES([CHAMPLAIN], [champlain-gtk-0.5 >= champlain_minimum_version], [have_champlain=yes], [have_champlain=no])
if test "x$have_champlain" = "xno"; then
PKG_CHECK_MODULES([CHAMPLAIN], [champlain-gtk-0.4 >= champlain_minimum_version], [have_champlain=yes], [have_champlain=no])
fi
AC_SUBST(CHAMPLAIN_CFLAGS)
AC_SUBST(CHAMPLAIN_LIBS)
if test "x$have_champlain" = "xno"; then
AC_MSG_ERROR([champlain-gtk is required for the contacts-map plugin. Use --disable-contacts-map to exclude the plugin.])
fi
PKG_CHECK_MODULES([GEOCLUE], [geoclue >= geoclue_minimum_version], [have_geoclue=yes], [have_geoclue=no])
AC_SUBST(GEOCLUE_CFLAGS)
AC_SUBST(GEOCLUE_LIBS)
if test "x$have_geoclue" = "xno"; then
AC_MSG_ERROR([geoclue is required for the contacts-map plugin. Use --disable-contacts-map to exclude the plugin.])
fi
plugins_standard="$plugins_standard contacts-map"
fi
fi
dnl *****************************************
dnl image-inline plugin requires gtkimageview
dnl *****************************************
@ -1847,6 +1860,4 @@ echo "
User documentation: $with_help
Mono bindings: $enable_mono
Python bindings: $enable_python
Libchamplain: $HAVE_CHAMPLAIN
Geoclue: $HAVE_GEOCLUE
"

15
plugins/contacts-map/Makefile.am
View File

@ -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)