From e3561c50baeaf9d7f24892c3e72cd46eab91d111 Mon Sep 17 00:00:00 2001
From: Chenthill Palanisamy <pchenthill@novell.com>
Date: Mon, 30 Nov 2009 15:15:39 +0530
Subject: Fixes a build break.

---
 addressbook/gui/contact-editor/e-contact-editor.c | 1 -
 configure.ac                                      | 2 +-
 modules/mail/Makefile.am                          | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 493d92edbe..fbe8e57434 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -38,7 +38,6 @@
 #include <libedataserverui/e-category-completion.h>
 #include <libedataserverui/e-source-combo-box.h>
 
-#include <camel/camel.h>
 
 #include "addressbook/util/addressbook.h"
 #include "addressbook/printing/e-contact-print.h"
diff --git a/configure.ac b/configure.ac
index 5a3edfd62f..a00437d742 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1225,7 +1225,7 @@ AM_CONDITIONAL([NM_SUPPORT], [test "$NM_SUPPORT" = yes])
 dnl ******************************
 dnl Camel Flags
 dnl ******************************
-EVO_SET_COMPILE_FLAGS(CAMEL, camel-provider-$EDS_PACKAGE)
+EVO_SET_COMPILE_FLAGS(CAMEL, camel-provider-$EDS_PACKAGE, $MANUAL_NSS_CFLAGS, MOZILLA_NSS_CFLAGS)
 AC_SUBST(CAMEL_CFLAGS)
 AC_SUBST(CAMEL_LIBS)
 
diff --git a/modules/mail/Makefile.am b/modules/mail/Makefile.am
index 15ee1fc932..0b439428b7 100644
--- a/modules/mail/Makefile.am
+++ b/modules/mail/Makefile.am
@@ -7,6 +7,7 @@ libevolution_module_mail_la_CPPFLAGS =					\
 	-I$(top_srcdir)/widgets						\
 	$(GNOME_PLATFORM_CFLAGS)					\
 	$(EVOLUTION_MAIL_CFLAGS)					\
+	$(CAMEL_CFLAGS)							\
 	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"			\
 	-DEVOLUTION_UIDIR=\""$(uidir)"\"				\
 	-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\"			\
-- 
cgit v1.2.3