[evolution/camel-gobject] Fix missing library flags causing build issues.

[Matthew Barnes <mbarnes src gnome org>]

commit f786982c4dab04a66d2fe20fba93fc4a70a507cb
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Dec 27 12:06:40 2009 -0500

    Fix missing library flags causing build issues.

 calendar/gui/Makefile.am              |    3 ++-
 calendar/gui/alarm-notify/Makefile.am |    1 +
 calendar/gui/dialogs/Makefile.am      |    6 ++++--
 configure.ac                          |    4 ++--
 modules/calendar/Makefile.am          |    1 +
 plugins/pst-import/Makefile.am        |    2 ++
 plugins/publish-calendar/Makefile.am  |    2 ++
 widgets/e-timezone-dialog/Makefile.am |    2 +-
 8 files changed, 15 insertions(+), 6 deletions(-)
---
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index ea14f63..2134643 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -69,6 +69,7 @@ libevolution_calendar_la_CPPFLAGS =			\
 	-DEVOLUTION_UIDIR=\""$(uidir)"\"		\
 	-DPREFIX=\""$(prefix)"\"			\
 	$(GNOME_PLATFORM_CFLAGS)			\
+	$(CAMEL_CFLAGS)					\
 	$(LIBSOUP_CFLAGS)				\
 	$(EVOLUTION_CALENDAR_CFLAGS)
 
@@ -225,8 +226,8 @@ libevolution_calendar_la_LIBADD =					\
 	$(top_builddir)/filter/libfilter.la				\
 	$(top_builddir)/e-util/libeutil.la				\
 	$(GNOME_PLATFORM_LIBS)						\
-	$(LIBSOUP_LIBS)							\
 	$(CAMEL_LIBS)							\
+	$(LIBSOUP_LIBS)							\
 	$(EVOLUTION_CALENDAR_LIBS)
 
 libevolution_calendar_la_LDFLAGS = $(NO_UNDEFINED)
diff --git a/calendar/gui/alarm-notify/Makefile.am b/calendar/gui/alarm-notify/Makefile.am
index e861267..cfd631a 100644
--- a/calendar/gui/alarm-notify/Makefile.am
+++ b/calendar/gui/alarm-notify/Makefile.am
@@ -9,6 +9,7 @@ evolution_alarm_notify_CPPFLAGS = 			\
 	-DEVOLUTION_UIDIR=\""$(uidir)"\"		\
 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
 	-DEVOLUTION_LIBEXECDIR=\""$(privlibexecdir)"\"	\
+	$(CAMEL_CFLAGS)					\
 	$(EVOLUTION_CALENDAR_CFLAGS)			\
 	$(CANBERRA_CFLAGS)
 
diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am
index 8b7c456..e1a8e77 100644
--- a/calendar/gui/dialogs/Makefile.am
+++ b/calendar/gui/dialogs/Makefile.am
@@ -14,7 +14,8 @@ libcal_dialogs_la_CPPFLAGS = 						\
 	-DEVOLUTION_ICONSDIR=\""$(imagesdir)"\"				\
 	-DPREFIX=\""$(prefix)"\"					\
 	$(GNOME_PLATFORM_CFLAGS)					\
-	$(EVOLUTION_CALENDAR_CFLAGS)
+	$(EVOLUTION_CALENDAR_CFLAGS)					\
+	$(CAMEL_CFLAGS)
 
 ecalendarincludedir = $(privincludedir)/calendar/gui/dialogs
 
@@ -49,7 +50,8 @@ ecalendarinclude_HEADERS =	\
 
 libcal_dialogs_la_LIBADD =					\
 	$(top_builddir)/addressbook/util/libeabutil.la		\
-	$(GNOME_PLATFORM_LIBS)
+	$(GNOME_PLATFORM_LIBS)					\
+	$(CAMEL_LIBS)
 
 libcal_dialogs_la_SOURCES =	\
 	$(IDL_GENERATED)	\
diff --git a/configure.ac b/configure.ac
index f3ab029..d233960 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1292,7 +1292,7 @@ E_UTIL_LIBS="$E_UTIL_LIBS $MATH_LIB"
 dnl **************
 dnl TZDIALOG Flags
 dnl **************
-EVO_SET_COMPILE_FLAGS(TZDIALOG, libecal-$EDS_PACKAGE, $GNOME_PLATFORM_CFLAGS, $GNOME_PLATFORM_LIBS)
+EVO_SET_COMPILE_FLAGS(TZDIALOG, libecal-$EDS_PACKAGE camel-$EDS_PACKAGE, $GNOME_PLATFORM_CFLAGS, $GNOME_PLATFORM_LIBS)
 AC_SUBST(TZDIALOG_CFLAGS)
 AC_SUBST(TZDIALOG_LIBS)
 
@@ -1313,7 +1313,7 @@ AC_SUBST(IMPORTERS_LIBS)
 dnl ***************
 dnl LIBFILTER Flags
 dnl ***************
-EVO_SET_COMPILE_FLAGS(LIBFILTER, libedataserver-$EDS_PACKAGE)
+EVO_SET_COMPILE_FLAGS(LIBFILTER, libedataserver-$EDS_PACKAGE camel-$EDS_PACKAGE)
 AC_SUBST(LIBFILTER_CFLAGS)
 AC_SUBST(LIBFILTER_LIBS)
 
diff --git a/modules/calendar/Makefile.am b/modules/calendar/Makefile.am
index fee7c68..cf68814 100644
--- a/modules/calendar/Makefile.am
+++ b/modules/calendar/Makefile.am
@@ -8,6 +8,7 @@ libevolution_module_calendar_la_CPPFLAGS =		\
 	-I$(top_srcdir)/widgets				\
 	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"	\
 	$(GNOME_PLATFORM_CFLAGS)			\
+	$(CAMEL_CFLAGS)					\
 	$(EVOLUTION_CALENDAR_CFLAGS)
 
 libevolution_module_calendar_la_SOURCES =		\
diff --git a/plugins/pst-import/Makefile.am b/plugins/pst-import/Makefile.am
index 57ee130..296c9e4 100644
--- a/plugins/pst-import/Makefile.am
+++ b/plugins/pst-import/Makefile.am
@@ -20,6 +20,7 @@ liborg_gnome_pst_import_la_CPPFLAGS =			\
 	-DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\""	\
 	-DLOCALEDIR="\"$(LOCALEDIR)\""			\
 	$(GNOME_PLATFORM_CFLAGS)			\
+	$(CAMEL_CFLAGS)					\
 	$(EVOLUTION_CFLAGS)				\
 	$(EVOLUTION_CALENDAR_CFLAGS)			\
 	$(LIBPST_CFLAGS)
@@ -32,6 +33,7 @@ liborg_gnome_pst_import_la_LIBADD =			\
 	$(top_builddir)/mail/libevolution-mail.la	\
 	$(top_builddir)/e-util/libeutil.la		\
 	$(GNOME_PLATFORM_LIBS)				\
+	$(CAMEL_LIBS)					\
 	$(EVOLUTION_CALENDAR_LIBS)			\
 	$(EVOLUTION_MAIL_LIBS)				\
 	$(LIBPST_LIBS)
diff --git a/plugins/publish-calendar/Makefile.am b/plugins/publish-calendar/Makefile.am
index 60d5e12..614bb61 100644
--- a/plugins/publish-calendar/Makefile.am
+++ b/plugins/publish-calendar/Makefile.am
@@ -13,6 +13,7 @@ liborg_gnome_publish_calendar_la_CPPFLAGS =		\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_builddir)/shell				\
+	$(E_UTIL_CFLAGS)				\
 	$(EVOLUTION_CALENDAR_CFLAGS)			\
 	-DEVOLUTION_PLUGINDIR="\"$(plugindir)\""	\
 	-DEVOLUTION_UIDIR=\""$(uidir)"\"
@@ -34,6 +35,7 @@ liborg_gnome_publish_calendar_la_LIBADD =			\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/shell/libeshell.la			\
 	$(top_builddir)/calendar/gui/libevolution-calendar.la	\
+	$(E_UTIL_LIBS)						\
 	$(EVOLUTION_CALENDAR_LIBS)
 
 EXTRA_DIST =					\
diff --git a/widgets/e-timezone-dialog/Makefile.am b/widgets/e-timezone-dialog/Makefile.am
index ebdb6e2..b13e109 100644
--- a/widgets/e-timezone-dialog/Makefile.am
+++ b/widgets/e-timezone-dialog/Makefile.am
@@ -17,7 +17,7 @@ libetimezonedialog_la_LDFLAGS = $(NO_UNDEFINED)
 libetimezonedialog_la_LIBADD =				\
 	$(top_builddir)/e-util/libeutil.la		\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la	\
-	$(EVOLUTION_CALENDAR_LIBS)
+	$(TZDIALOG_LIBS)
 
 ui_DATA = e-timezone-dialog.ui