aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChenthill Palanisamy <pchenthill@novell.com>2009-11-30 17:45:39 +0800
committerChenthill Palanisamy <pchenthill@novell.com>2009-11-30 17:45:39 +0800
commite3561c50baeaf9d7f24892c3e72cd46eab91d111 (patch)
tree2311d363d85bfd0d242cdb2dec97a5fdac1ed8f4
parent0b1658ed7a215dad8295b02a30d5220011e199f1 (diff)
downloadgsoc2013-evolution-e3561c50baeaf9d7f24892c3e72cd46eab91d111.tar
gsoc2013-evolution-e3561c50baeaf9d7f24892c3e72cd46eab91d111.tar.gz
gsoc2013-evolution-e3561c50baeaf9d7f24892c3e72cd46eab91d111.tar.bz2
gsoc2013-evolution-e3561c50baeaf9d7f24892c3e72cd46eab91d111.tar.lz
gsoc2013-evolution-e3561c50baeaf9d7f24892c3e72cd46eab91d111.tar.xz
gsoc2013-evolution-e3561c50baeaf9d7f24892c3e72cd46eab91d111.tar.zst
gsoc2013-evolution-e3561c50baeaf9d7f24892c3e72cd46eab91d111.zip
Fixes a build break.
-rw-r--r--addressbook/gui/contact-editor/e-contact-editor.c1
-rw-r--r--configure.ac2
-rw-r--r--modules/mail/Makefile.am1
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)"\" \