[evolution-data-server] I caused a build break, shame on me.



commit 4928aaeaf4ab159d9ad040de744c7b1e9cdd4d06
Author: Matthew Barnes <mbarnes redhat com>
Date:   Wed Jun 23 10:48:30 2010 -0400

    I caused a build break, shame on me.

 configure.ac                 |    2 +-
 libedataserverui/Makefile.am |    6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b5661d1..f8a1390 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1161,7 +1161,7 @@ AC_SUBST(E_DATA_SERVER_LIBS)
 dnl ******************************
 dnl libedataserverui
 dnl ******************************
-E_DATA_SERVER_UI_DEPS="gtk+-2.0 libxml-2.0 gobject-2.0 gthread-2.0 gconf-2.0 camel-1.2 $GNOME_KEYRING_REQUIREMENT"
+E_DATA_SERVER_UI_DEPS="gtk+-2.0 libxml-2.0 gobject-2.0 gthread-2.0 gconf-2.0 $GNOME_KEYRING_REQUIREMENT"
 
 EVO_SET_COMPILE_FLAGS(E_DATA_SERVER_UI, $E_DATA_SERVER_UI_DEPS, , )
 AC_SUBST(E_DATA_SERVER_UI_CFLAGS)
diff --git a/libedataserverui/Makefile.am b/libedataserverui/Makefile.am
index 0759d58..b6962b5 100644
--- a/libedataserverui/Makefile.am
+++ b/libedataserverui/Makefile.am
@@ -18,7 +18,8 @@ libedataserverui_1_2_la_CPPFLAGS = \
 	-I$(top_builddir)/addressbook		\
 	-DG_LOG_DOMAIN=\"e-data-server-ui\"	\
 	-DE_DATA_SERVER_UI_UIDIR=\""$(uidir)"\"	\
-	$(E_DATA_SERVER_UI_CFLAGS)
+	$(E_DATA_SERVER_UI_CFLAGS)		\
+	$(CAMEL_CFLAGS)
 
 libedataserverui_1_2_la_SOURCES =	\
 	$(MARSHAL_GENERATED)		\
@@ -43,7 +44,8 @@ libedataserverui_1_2_la_SOURCES =	\
 libedataserverui_1_2_la_LIBADD = 				\
 	$(top_builddir)/addressbook/libebook/libebook-1.2.la	\
 	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
-	$(E_DATA_SERVER_UI_LIBS)
+	$(E_DATA_SERVER_UI_LIBS)				\
+	$(CAMEL_LIBS)
 
 libedataserverui_1_2_la_LDFLAGS = 										\
 	-version-info $(LIBEDATASERVERUI_CURRENT):$(LIBEDATASERVERUI_REVISION):$(LIBEDATASERVERUI_AGE) $(NO_UNDEFINED)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]