Make evolution mail link to camel-provider not camel only. Removed some

2004-12-02  Not Zed  <NotZed@Ximian.com>

        * configure.in: Make evolution mail link to camel-provider not
        camel only.  Removed some camel stuff.

2004-11-16  Not Zed  <NotZed@Ximian.com>

        * Makefile.am (SUBDIRS): removed camel.

        * configure.in: Removed camel building, fixed module includes to
        use camel via packageconfig.

2004-11-15  Not Zed  <NotZed@Ximian.com>

        * configure.in: Added libeds to camel and mail and filter cflags.

svn path=/trunk/; revision=28053

4 files changed, 23 insertions, 51 deletions

diff --git a/ChangeLog b/ChangeLog
index 047564ca50..71e2fc0eed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,22 @@
 
 	* configure.in: bump version, requires
 
+2004-12-02  Not Zed  <NotZed@Ximian.com>
+
+	* configure.in: Make evolution mail link to camel-provider not
+	camel only.  Removed some camel stuff.
+
+2004-11-16  Not Zed  <NotZed@Ximian.com>
+
+	* Makefile.am (SUBDIRS): removed camel.
+
+	* configure.in: Removed camel building, fixed module includes to
+	use camel via packageconfig.
+
+2004-11-15  Not Zed  <NotZed@Ximian.com>
+
+	* configure.in: Added libeds to camel and mail and filter cflags.
+
 2004-11-09  Rodney Dawes  <dobey@novell.com>
 
 	* configure.in: Add AC_SUBST for plugins_base also
diff --git a/Makefile.am b/Makefile.am
index 69b9e790ce..3bf625992d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,6 @@ changelogs =				\
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = 				\
-	camel-$(BASE_VERSION).pc		\
 	evolution-shell-$(BASE_VERSION).pc
 
 EXTRA_DIST = 			\
@@ -37,7 +36,6 @@ SUBDIRS = 			\
 	a11y			\
         widgets                 \
         shell                   \
-	camel			\
 	filter			\
 	$(SMIME_DIR)		\
 	addressbook		\
diff --git a/camel.pc.in b/camel.pc.in
deleted file mode 100644
index 2e211b0753..0000000000
--- a/camel.pc.in
+++ /dev/null
@@ -1,15 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-camel_providerdir=@camel_providerdir@
-privlibdir=@privlibdir@
-privincludedir=@privincludedir@
-
-Name: camel
-Description: the Evolution mail library
-Version: @VERSION@
-Requires: gal-2.4 >= @GAL_REQUIRED@
-Libs: -L${privlibdir} -lcamel
-Cflags: -I${privincludedir}
diff --git a/configure.in b/configure.in
index 235ae8a41c..37a954e075 100644
--- a/configure.in
+++ b/configure.in
@@ -122,7 +122,7 @@ AC_ARG_ENABLE(test-component, [  --enable-test-component=[no/yes]      Enable te
 AM_CONDITIONAL(ENABLE_TEST_COMPONENT, test "x$enable_test_comp" = "xyes")
 
 dnl
-dnl system mail stuff
+dnl system mail stuff (tbd?)
 dnl
 AC_PATH_PROG(SENDMAIL, sendmail, /usr/sbin/sendmail, /usr/sbin:/usr/lib)
 AC_DEFINE_UNQUOTED(SENDMAIL_PATH, "$SENDMAIL", [Path to a sendmail binary, or equivalent])
@@ -1130,15 +1130,11 @@ CPPFLAGS="$CPPFLAGS_save"
 
 dnl --- Flags for the various libraries we build
 
-EVO_SET_COMPILE_FLAGS(CAMEL, glib-2.0 gthread-2.0 gal-2.4 >= $GAL_REQUIRED $mozilla_nss,
-		      $THREADS_CFLAGS $KRB4_CFLAGS $KRB5_CFLAGS $MANUAL_NSS_CFLAGS $OPENSSL_CFLAGS,
-	              $THREADS_LIBS $KRB4_LDFLAGS $KRB5_LDFLAGS $MANUAL_NSS_LIBS $OPENSSL_LDFLAGS)
+EVO_SET_COMPILE_FLAGS(CAMEL, camel-provider-$EDS_PACKAGE)
 AC_SUBST(CAMEL_CFLAGS)
 AC_SUBST(CAMEL_LIBS)
 
-EVO_SET_COMPILE_FLAGS(CAMEL_GROUPWISE, libegroupwise-$EDS_PACKAGE >= $EDS_REQUIRED,
-		      $CAMEL_CFLAGS,
-	              $CAMEL_LIBS)
+EVO_SET_COMPILE_FLAGS(CAMEL_GROUPWISE, camel-provider-$EDS_PACKAGE libegroupwise-$EDS_PACKAGE >= $EDS_REQUIRED)
 AC_SUBST(CAMEL_GROUPWISE_CFLAGS)
 AC_SUBST(CAMEL_GROUPWISE_LIBS)
 
@@ -1173,11 +1169,11 @@ EVO_SET_COMPILE_FLAGS(E_WIDGETS, glib-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED
 AC_SUBST(E_WIDGETS_CFLAGS)
 AC_SUBST(E_WIDGETS_LIBS)
  
-EVO_SET_COMPILE_FLAGS(IMPORTERS, gconf-2.0 libglade-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED libgnomeui-2.0 libebook-$EDS_PACKAGE >= $EDS_REQUIRED)
+EVO_SET_COMPILE_FLAGS(IMPORTERS, camel-$EDS_PACKAGE gconf-2.0 libglade-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED libgnomeui-2.0 libebook-$EDS_PACKAGE >= $EDS_REQUIRED)
 AC_SUBST(IMPORTERS_CFLAGS)
 AC_SUBST(IMPORTERS_LIBS)
 
-EVO_SET_COMPILE_FLAGS(LIBFILTER, libgnome-2.0 libgnomeui-2.0 libglade-2.0 libxml-2.0 gconf-2.0 gal-$GAL_PACKAGE >= $GAL_REQUIRED)
+EVO_SET_COMPILE_FLAGS(LIBFILTER, libgnome-2.0 libgnomeui-2.0 libglade-2.0 libxml-2.0 gconf-2.0 gal-$GAL_PACKAGE >= $GAL_REQUIRED libedataserver-$EDS_PACKAGE >= $EDS_REQUIRED)
 AC_SUBST(LIBFILTER_CFLAGS)
 AC_SUBST(LIBFILTER_LIBS)
 
@@ -1189,7 +1185,7 @@ AC_SUBST(SHELL_LIBS)
 
 dnl --- evolution-addressbook flags
 
-EVOLUTION_ADDRESSBOOK_DEPS="gconf-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED libglade-2.0 gal-$GAL_PACKAGE >= $GAL_REQUIRED libgnomeui-2.0 libgnome-2.0 libgnomecanvas-2.0 gnome-vfs-2.0 libgnomeprintui-2.2 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libebook-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED"
+EVOLUTION_ADDRESSBOOK_DEPS="gconf-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED libglade-2.0 gal-$GAL_PACKAGE >= $GAL_REQUIRED libgnomeui-2.0 libgnome-2.0 libgnomecanvas-2.0 gnome-vfs-2.0 libgnomeprintui-2.2 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libebook-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED camel-$EDS_PACKAGE"
 
 EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS)
 AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)
@@ -1218,7 +1214,7 @@ fi
 
 dnl --- evolution-mail flags
 
-EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED gal-$GAL_PACKAGE >= $GAL_REQUIRED libglade-2.0 gnome-vfs-module-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libxml-2.0 bonobo-activation-2.0 gthread-2.0 gconf-2.0 $mozilla_nss libebook-$EDS_PACKAGE >= $EDS_REQUIRED)
+EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, camel-provider-$EDS_PACKAGE libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED gal-$GAL_PACKAGE >= $GAL_REQUIRED libglade-2.0 gnome-vfs-module-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libxml-2.0 bonobo-activation-2.0 gthread-2.0 gconf-2.0 $mozilla_nss libebook-$EDS_PACKAGE >= $EDS_REQUIRED)
 AC_SUBST(EVOLUTION_MAIL_CFLAGS)
 AC_SUBST(EVOLUTION_MAIL_LIBS)
 
@@ -1262,9 +1258,6 @@ AC_SUBST(privdatadir)
 privincludedir='${includedir}'/evolution-$BASE_VERSION
 AC_SUBST(privincludedir)
 
-camel_providerdir="$privlibdir/camel-providers"
-AC_SUBST(camel_providerdir)
-
 componentdir="$privlibdir/components"
 AC_SUBST(componentdir)
 
@@ -1492,25 +1485,6 @@ addressbook/printing/Makefile
 addressbook/tools/Makefile
 addressbook/util/Makefile
 art/Makefile
-camel/Makefile
-camel/providers/Makefile
-camel/providers/groupwise/Makefile
-camel/providers/imap/Makefile
-camel/providers/imapp/Makefile
-camel/providers/imap4/Makefile
-camel/providers/local/Makefile
-camel/providers/nntp/Makefile
-camel/providers/pop3/Makefile
-camel/providers/sendmail/Makefile
-camel/providers/smtp/Makefile
-camel/tests/Makefile
-camel/tests/folder/Makefile
-camel/tests/lib/Makefile
-camel/tests/message/Makefile
-camel/tests/mime-filter/Makefile
-camel/tests/misc/Makefile
-camel/tests/smime/Makefile
-camel/tests/stream/Makefile
 data/Makefile
 data/cde_app_root/Makefile
 data/cde_app_root/dt/Makefile
@@ -1578,7 +1552,6 @@ smime/lib/Makefile
 smime/gui/Makefile
 tools/Makefile
 evolution-shell.pc
-camel.pc
 ])
 
 if test "x$with_sub_version" != "x"; then