aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rw-r--r--configure.in24
2 files changed, 18 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am
index cc817fe738..dea925cc7f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,6 +29,8 @@ SUBDIRS = \
libversit \
widgets \
shell \
+ camel \
+ filter \
libwombat \
calendar \
art \
diff --git a/configure.in b/configure.in
index 86d3225eaf..c215f4a5d3 100644
--- a/configure.in
+++ b/configure.in
@@ -1044,11 +1044,11 @@ AC_SUBST(GNOME_FULL_LIBS)
dnl --- Flags for the various libraries we build
-dnl EVO_SET_COMPILE_FLAGS(CAMEL, gal xml,
-dnl $THREADS_CFLAGS $KRB4_CFLAGS $NSS_CFLAGS $NSPR_CFLAGS $OPENSSL_CFLAGS,
-dnl $THREADS_LIBS $KRB4_LDFLAGS $NSS_LDFLAGS $NSPR_LDFLAGS $OPENSSL_LDFLAGS)
-dnl AC_SUBST(CAMEL_CFLAGS)
-dnl AC_SUBST(CAMEL_LIBS)
+EVO_SET_COMPILE_FLAGS(CAMEL, glib-2.0 libxml-2.0,
+ $THREADS_CFLAGS $KRB4_CFLAGS $NSS_CFLAGS $NSPR_CFLAGS $OPENSSL_CFLAGS,
+ $THREADS_LIBS $KRB4_LDFLAGS $NSS_LDFLAGS $NSPR_LDFLAGS $OPENSSL_LDFLAGS)
+AC_SUBST(CAMEL_CFLAGS)
+AC_SUBST(CAMEL_LIBS)
EVO_SET_COMPILE_FLAGS(E_NAME, libgnomeui-2.0 libbonoboui-2.0 gal-2.0)
AC_SUBST(E_NAME_CFLAGS)
@@ -1073,7 +1073,7 @@ dnl $THREADS_CFLAGS, $THREADS_LIBS)
dnl AC_SUBST(LIBIBEX_CFLAGS)
dnl AC_SUBST(LIBIBEX_LIBS)
-EVO_SET_COMPILE_FLAGS(LIBFILTER, libgnome-2.0 libgnomeui-2.0 libglade-2.0 gal-2.0)
+EVO_SET_COMPILE_FLAGS(LIBFILTER, libgnome-2.0 libgnomeui-2.0 libglade-2.0 libxml-2.0 gconf-2.0 gal-2.0)
AC_SUBST(LIBFILTER_CFLAGS)
AC_SUBST(LIBFILTER_LIBS)
@@ -1121,8 +1121,8 @@ dnl ******************************
privlibdir='$(pkglibdir)/'$EVOLUTION_MAJOR_VERSION.$EVOLUTION_MINOR_VERSION
AC_SUBST(privlibdir)
-dnl camel_providerdir="$privlibdir/camel-providers"
-dnl AC_SUBST(camel_providerdir)
+camel_providerdir="$privlibdir/camel-providers"
+AC_SUBST(camel_providerdir)
dnl EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, $FULL_GNOME_DEPS soup, $GCONF_CFLAGS $THREADS_CFLAGS ${GTKHTML_CFLAGS}, $GCONF_LIBS $THREADS_LIBS ${GTKHTML_LIBS})
dnl AC_SUBST(EVOLUTION_MAIL_CFLAGS)
@@ -1249,6 +1249,14 @@ addressbook/backend/Makefile
addressbook/backend/ebook/Makefile
addressbook/backend/pas/Makefile
art/Makefile
+camel/Makefile
+camel/providers/Makefile
+camel/providers/local/Makefile
+camel/providers/imap/Makefile
+camel/providers/nntp/Makefile
+camel/providers/pop3/Makefile
+camel/providers/sendmail/Makefile
+camel/providers/smtp/Makefile
data/Makefile
data/cde_app_root/Makefile
data/cde_app_root/dt/Makefile