evolution r36860 - in trunk: . plugins/calendar-weather
- From: msuman svn gnome org
- To: svn-commits-list gnome org
- Subject: evolution r36860 - in trunk: . plugins/calendar-weather
- Date: Wed, 10 Dec 2008 03:38:52 +0000 (UTC)
Author: msuman
Date: Wed Dec 10 03:38:51 2008
New Revision: 36860
URL: http://svn.gnome.org/viewvc/evolution?rev=36860&view=rev
Log:
Make the libgweather dependency optional, build the weather calendar setup plugin by default and provide an option to disable it.
Modified:
trunk/ChangeLog
trunk/configure.in
trunk/plugins/calendar-weather/ChangeLog
trunk/plugins/calendar-weather/Makefile.am
Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in (original)
+++ trunk/configure.in Wed Dec 10 03:38:51 2008
@@ -43,6 +43,7 @@
m4_define([hal_minimum_version], [0.5.4])
m4_define([libnotify_minimum_version], [0.3.0])
m4_define([gnome_pilot_minimum_version], [2.0.15])
+m4_define([gweather_minimum_version], [2.25.3])
# GNOME Documentation
GNOME_DOC_INIT
@@ -1206,6 +1207,25 @@
AC_SUBST(MANUAL_NSS_LIBS)
dnl **************************************************
+dnl Check if we should build the weather calendar plugin
+dnl **************************************************
+AC_MSG_CHECKING(if we should build the weather calendar plugin)
+AC_ARG_WITH([weather],
+ [AS_HELP_STRING([--with-weather], [Build the weather calendar setup plugin (default=yes)])],
+ [use_gweather=$withval],
+ [use_gweather=yes])
+AC_MSG_RESULT($use_gweather)
+
+if test $use_gweather = yes; then
+ PKG_CHECK_MODULES([LIBGWEATHER],
+ [gweather >= gweather_minimum_version],
+ [CALENDAR_WEATHER="calendar-weather"],
+ [AC_MSG_ERROR([The weather calendar setup plugin requires GWeather >= gweather_minimum_version. Alternatively, you may specify --without-weather as a configure option to avoid building the plugin.])])
+else
+ CALENDAR_WEATHER=""
+fi
+
+dnl **************************************************
dnl Exchange support.
dnl **************************************************
AC_ARG_ENABLE([exchange],
@@ -1734,7 +1754,7 @@
[enable_plugins="$enableval"],[enable_plugins=all])
dnl Add any new plugins here
-plugins_base_always="calendar-file calendar-http calendar-weather itip-formatter plugin-manager default-source addressbook-file startup-wizard mark-all-read groupwise-features groupwise-account-setup mail-account-disable publish-calendar caldav imap-features google-account-setup webdav-account-setup"
+plugins_base_always="calendar-file calendar-http $CALENDAR_WEATHER itip-formatter plugin-manager default-source addressbook-file startup-wizard mark-all-read groupwise-features groupwise-account-setup mail-account-disable publish-calendar caldav imap-features google-account-setup webdav-account-setup"
plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN "
all_plugins_base="$plugins_base_always sa-junk-plugin bogo-junk-plugin exchange-operations mono"
Modified: trunk/plugins/calendar-weather/Makefile.am
==============================================================================
--- trunk/plugins/calendar-weather/Makefile.am (original)
+++ trunk/plugins/calendar-weather/Makefile.am Wed Dec 10 03:38:51 2008
@@ -1,7 +1,5 @@
eds_datadir = `pkg-config --variable=privdatadir evolution-data-server-1.2`
weatherdatadir = $(datadir)/evolution/$(BASE_VERSION)/weather
-LIBGWEATHER_CFLAGS = `pkg-config --cflags gweather`
-LIBGWEATHER_LIBS = `pkg-config --libs gweather`
INCLUDES = \
-I$(top_srcdir) \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]