evolution-data-server r8833 - in trunk: . calendar calendar/libedata-cal libebackend

[msuman svn gnome org]

Author: msuman
Date: Fri May 23 08:40:57 2008
New Revision: 8833
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=8833&view=rev

Log:
Patch from Ed Catmur  <ed catmur co uk>: Fix for bug #533780 (linking issues with libebackend)

Modified:
   trunk/ChangeLog
   trunk/calendar/ChangeLog
   trunk/calendar/libedata-cal/Makefile.am
   trunk/configure.in
   trunk/libebackend/Makefile.am

Modified: trunk/calendar/libedata-cal/Makefile.am
==============================================================================
--- trunk/calendar/libedata-cal/Makefile.am	(original)
+++ trunk/calendar/libedata-cal/Makefile.am	Fri May 23 08:40:57 2008
@@ -48,6 +48,7 @@
 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 = 								\

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri May 23 08:40:57 2008
@@ -1445,7 +1445,7 @@
 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)

Modified: trunk/libebackend/Makefile.am
==============================================================================
--- trunk/libebackend/Makefile.am	(original)
+++ trunk/libebackend/Makefile.am	Fri May 23 08:40:57 2008
@@ -14,6 +14,7 @@
 	e-file-cache.c
 
 libebackend_1_2_la_LIBADD = 				\
+	$(top_builddir)/libedataserver/libedataserver-1.2.la \
 	$(E_BACKEND_LIBS)				\
 	$(DB_LIBS)