aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/calendar-weather
diff options
context:
space:
mode:
authorSuman Manjunath <msuman@src.gnome.org>2008-12-10 11:38:51 +0800
committerSuman Manjunath <msuman@src.gnome.org>2008-12-10 11:38:51 +0800
commit415b951b22cd467afadf1866c53ef5c1caa5eacb (patch)
treeddc360b982132ef73a2699e8440d99a54a7a27f0 /plugins/calendar-weather
parente21153cdc86e029a16501cb8686f99f93a15555f (diff)
downloadgsoc2013-evolution-415b951b22cd467afadf1866c53ef5c1caa5eacb.tar
gsoc2013-evolution-415b951b22cd467afadf1866c53ef5c1caa5eacb.tar.gz
gsoc2013-evolution-415b951b22cd467afadf1866c53ef5c1caa5eacb.tar.bz2
gsoc2013-evolution-415b951b22cd467afadf1866c53ef5c1caa5eacb.tar.lz
gsoc2013-evolution-415b951b22cd467afadf1866c53ef5c1caa5eacb.tar.xz
gsoc2013-evolution-415b951b22cd467afadf1866c53ef5c1caa5eacb.tar.zst
gsoc2013-evolution-415b951b22cd467afadf1866c53ef5c1caa5eacb.zip
Make the libgweather dependency optional, build the weather calendar setup plugin by default and provide an option to disable it.
svn path=/trunk/; revision=36860
Diffstat (limited to 'plugins/calendar-weather')
-rw-r--r--plugins/calendar-weather/ChangeLog5
-rw-r--r--plugins/calendar-weather/Makefile.am2
2 files changed, 5 insertions, 2 deletions
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) \