2013-02-24 [colin] 3.9.0cvs102

	* src/plugins/vcalendar/libical/libical/Makefile.am
		Fix build without vcalendar

diff --git a/ChangeLog b/ChangeLog
index ceb449d4faa8084e65a8acd82138c33dc8dea6ed..08ed91cf871ec2eb71c761b2f080bc767a037984 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-24 [colin]     3.9.0cvs102
+
+       * src/plugins/vcalendar/libical/libical/Makefile.am
+               Fix build without vcalendar
+
 2013-02-23 [paul]      3.9.0cvs101
 
        * src/mimeview.c

diff --git a/PATCHSETS b/PATCHSETS
index 99a8ce9e5d636385f601b7a9ef2518fbebc0be5e..00c2bbcde829744d39580077b33e8ba39992114d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4599,3 +4599,4 @@
 ( cvs diff -u -r 1.654.2.4675 -r 1.654.2.4676 configure.ac;  ) > 3.9.0cvs99.patchset
 ( cvs diff -u -r 1.100.2.89 -r 1.100.2.90 AUTHORS;  cvs diff -u -r 1.1.2.84 -r 1.1.2.85 src/gtk/authors.h;  cvs diff -u -r 1.395.2.461 -r 1.395.2.462 src/summaryview.c;  ) > 3.9.0cvs100.patchset
 ( cvs diff -u -r 1.83.2.196 -r 1.83.2.197 src/mimeview.c;  ) > 3.9.0cvs101.patchset
+( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src//plugins/vcalendar/libical/libical/Makefile.am;  ) > 3.9.0cvs102.patchset

diff --git a/configure.ac b/configure.ac
index befca107e8113d8c6a5ae8d5307c1e74a1aac969..4afd16888f80dfdfbaffc692bcb2666f0266e4d9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=9
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=101
+EXTRA_VERSION=102
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/vcalendar/libical/libical/Makefile.am b/src/plugins/vcalendar/libical/libical/Makefile.am
index 579762b75ae3cd372dd9e76ce9d559697478fc07..16714aec0c1eb8c2b19868e5dc254b346ff88d05 100644 (file)
--- a/src/plugins/vcalendar/libical/libical/Makefile.am
+++ b/src/plugins/vcalendar/libical/libical/Makefile.am
@@ -26,7 +26,9 @@
 DESIGNDATA = $(top_srcdir)/src/plugins/vcalendar/libical/design-data
 ICALSCRIPTS = $(top_srcdir)/src/plugins/vcalendar/libical/scripts
 
+if BUILD_VCALENDAR_PLUGIN
 noinst_LTLIBRARIES = libical.la
+endif
 
 YFLAGS = -d -v -t -pical_yy
 LFLAGS = -Pical_yy