diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.in | 22 | ||||
| -rw-r--r-- | plugins/calendar-weather/ChangeLog | 5 | ||||
| -rw-r--r-- | plugins/calendar-weather/Makefile.am | 2 |
4 files changed, 32 insertions, 3 deletions
@@ -1,3 +1,9 @@ +2008-12-10 Suman Manjunath <msuman@novell.com> + + * configure.in: Build the weather calendar setup plugin unless + explicitly requested not to, thereby making the libgweather + dependency optional. + 2008-12-01 Srinivasa Ragavan <sragavan@novell.com> * NEWS: Evolution 2.25.2 release changes. diff --git a/configure.in b/configure.in index 3281a137f9..c1c23298de 100644 --- a/configure.in +++ b/configure.in @@ -43,6 +43,7 @@ m4_define([dbus_minimum_version], [1.0.0]) 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_CFLAGS) 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 @@ AC_ARG_ENABLE([plugins], [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" diff --git a/plugins/calendar-weather/ChangeLog b/plugins/calendar-weather/ChangeLog index 2d70b465a0..a34f5df01b 100644 --- a/plugins/calendar-weather/ChangeLog +++ b/plugins/calendar-weather/ChangeLog @@ -1,3 +1,8 @@ +2008-12-10 Suman Manjunath <msuman@novell.com> + + * Makefile.am: Don't try to specify LIBGWEATHER_(CFLAGS|LIBS), they + will be provided by configure.in. + 2008-12-03 Milan Crha <mcrha@redhat.com> ** Part of fix for bug #352287 diff --git a/plugins/calendar-weather/Makefile.am b/plugins/calendar-weather/Makefile.am index b5a811118c..2e2be150e3 100644 --- a/plugins/calendar-weather/Makefile.am +++ b/plugins/calendar-weather/Makefile.am @@ -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) \ |