From: Colin Leroy Date: Sun, 24 Feb 2013 12:25:51 +0000 (+0000) Subject: 2013-02-24 [colin] 3.9.0cvs102 X-Git-Tag: 3.9.1~92 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=cc0645915208a6e488b36331d3fef66d3a06695e 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 ceb449d4f..08ed91cf8 100644 --- 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 99a8ce9e5..00c2bbcde 100644 --- 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 befca107e..4afd16888 100644 --- 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 579762b75..16714aec0 100644 --- 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