diff options
| author | Suman Manjunath <msuman@src.gnome.org> | 2008-05-23 08:40:57 +0000 |
|---|---|---|
| committer | Suman Manjunath <msuman@src.gnome.org> | 2008-05-23 08:40:57 +0000 |
| commit | f23767a8b1ce200119211572a26f40676ee774f4 (patch) | |
| tree | a64b50095efafa7605f1ccc7fccd2c09d5c9a2a6 | |
| parent | d4c4655bd7f900a6a721350076d1bff4c3d0b2d5 (diff) | |
| download | evolution-data-server-f23767a8b1ce200119211572a26f40676ee774f4.tar.gz | |
Patch from Ed Catmur <ed@catmur.co.uk>: Fix for bug #533780 (linking issues with libebackend)
svn path=/trunk/; revision=8833
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | calendar/ChangeLog | 10 | ||||
| -rw-r--r-- | calendar/libedata-cal/Makefile.am | 1 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | libebackend/Makefile.am | 1 |
5 files changed, 19 insertions, 3 deletions
@@ -1,3 +1,11 @@ +2008-05-23 Ed Catmur <ed@catmur.co.uk> + + ** Fix for bug #533780 + + * configure.in: + * libebackend/Makefile.am: + Fix the link line for libebackend. + 2008-05-16 Matthew Barnes <mbarnes@redhat.com> ** Fixes bug #532836 diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 03ba2133d..1ee290946 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,9 @@ +2008-05-23 Ed Catmur <ed@catmur.co.uk> + + ** Fix for bug #533780 + + * libedata-cal/Makefile.am: Link against libebackend. + 2008-05-13 Matthew Barnes <mbarnes@redhat.com> * libedata-cal/libedata-cal.pc.in: Require libebackend-1.2. @@ -31,8 +37,8 @@ 2008-04-29 Chenthill Palanisamy <pchenthill@novell.com> - ** Fixes #358584 (bnc) - Display of web calendars ignores timezones + ** Fixes #358584 (bnc) + Display of web calendars ignores timezones * backends/http/e-cal-backend-http.c: (retrieval_done): diff --git a/calendar/libedata-cal/Makefile.am b/calendar/libedata-cal/Makefile.am index d57b166fe..3b8a3046f 100644 --- a/calendar/libedata-cal/Makefile.am +++ b/calendar/libedata-cal/Makefile.am @@ -48,6 +48,7 @@ libedata_cal_1_2_la_SOURCES = \ libedata_cal_1_2_la_LIBADD = \ $(top_builddir)/calendar/libecal/libecal-1.2.la \ $(top_builddir)/libedataserver/libedataserver-1.2.la \ + $(top_builddir)/libebackend/libebackend-1.2.la \ $(EVOLUTION_CALENDAR_LIBS) libedata_cal_1_2_la_LDFLAGS = \ diff --git a/configure.in b/configure.in index a17ac2903..26b944969 100644 --- a/configure.in +++ b/configure.in @@ -1445,7 +1445,7 @@ EVO_SET_COMPILE_FLAGS(E_DATA_SERVER_UI, $E_DATA_SERVER_UI_DEPS, $THREADS_CFLAGS, AC_SUBST(E_DATA_SERVER_UI_CFLAGS) AC_SUBST(E_DATA_SERVER_UI_LIBS) -E_BACKEND_DEPS="gobject-2.0 libxml-2.0" +E_BACKEND_DEPS="gobject-2.0 libxml-2.0 gmodule-2.0" EVO_SET_COMPILE_FLAGS(E_BACKEND, $E_BACKEND_DEPS) AC_SUBST(E_BACKEND_CFLAGS) diff --git a/libebackend/Makefile.am b/libebackend/Makefile.am index 4e06c3f0d..754e039da 100644 --- a/libebackend/Makefile.am +++ b/libebackend/Makefile.am @@ -14,6 +14,7 @@ libebackend_1_2_la_SOURCES = \ e-file-cache.c libebackend_1_2_la_LIBADD = \ + $(top_builddir)/libedataserver/libedataserver-1.2.la \ $(E_BACKEND_LIBS) \ $(DB_LIBS) |