[evolution-patches] patch to move groupwise dep into the groupwise camel provider

[Chris Toshok <toshok ximian com>]

as it stands the addressbook (and possibly the calendar) end up with
deps on libegroupwise when they don't need them, due to libegroupwise
being added to the toplevel CAMEL_LIBS/CFLAGS.

This patch moves them down in the provider, so no other components
contain the explicit dep.

chris

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/camel/ChangeLog,v
retrieving revision 1.2213
diff -u -r1.2213 ChangeLog
--- ChangeLog	2 Jul 2004 12:19:34 -0000	1.2213
+++ ChangeLog	8 Jul 2004 00:12:06 -0000
@@ -1,3 +1,9 @@
+2004-07-07  Chris Toshok  <toshok ximian com>
+
+	* providers/groupwise/Makefile.am (INCLUDES): use
+	CAMEL_GROUPWISE_CFLAGS.
+	(libcamelgroupwise_la_LIBADD): use CAMEL_GROUPWISE_LIBS.
+
 2004-07-02  Christian Neumair  <chris gnome-de org>
 
 	* camel-smime-context.c: s/Can't/Cannot/.
Index: providers/groupwise/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/camel/providers/groupwise/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- providers/groupwise/Makefile.am	21 Apr 2004 12:08:24 -0000	1.5
+++ providers/groupwise/Makefile.am	8 Jul 2004 00:12:06 -0000
@@ -14,7 +14,7 @@
 	-I$(top_srcdir)/camel/providers/imap		\
 	-I$(top_srcdir)/camel/providers/smtp		\
 	$(EVOLUTION_CALENDAR_CFLAGS)                  \
-	$(CAMEL_CFLAGS)					\
+	$(CAMEL_GROUPWISE_CFLAGS)			\
 	$(GNOME_INCLUDEDIR)				\
 	$(E_UTIL_CFLAGS)				\
 	$(GTK_INCLUDEDIR)				\
@@ -25,7 +25,7 @@
 	camel-groupwise-provider.c		\
 	camel-gw-listener.c 		\
 	camel-gw-listener.h		
-libcamelgroupwise_la_LIBADD = $(CAMEL_LIBS)
+libcamelgroupwise_la_LIBADD = $(CAMEL_GROUPWISE_LIBS)
 
 libcamelgroupwise_la_LDFLAGS = -avoid-version -module
 

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/ChangeLog,v
retrieving revision 1.1347
diff -u -r1.1347 ChangeLog
--- ChangeLog	5 Jul 2004 15:08:21 -0000	1.1347
+++ ChangeLog	8 Jul 2004 00:11:31 -0000
@@ -1,3 +1,7 @@
+2004-07-07  Chris Toshok  <toshok ximian com>
+
+	* configure.in: add CAMEL_GROUPWISE cflags/libs.
+
 2004-07-02  JP Rosevear  <jpr novell com>
 
 	* configure.in: bump version, requirements
Index: configure.in
===================================================================
RCS file: /cvs/gnome/evolution/configure.in,v
retrieving revision 1.698
diff -u -r1.698 configure.in
--- configure.in	5 Jul 2004 15:08:21 -0000	1.698
+++ configure.in	8 Jul 2004 00:11:31 -0000
@@ -1035,11 +1035,17 @@
 
 dnl --- Flags for the various libraries we build
 
-EVO_SET_COMPILE_FLAGS(CAMEL, glib-2.0 gthread-2.0 gal-2.2 >= $GAL_REQUIRED libegroupwise-1.0 >= $EDS_REQUIRED $mozilla_nss,
+EVO_SET_COMPILE_FLAGS(CAMEL, glib-2.0 gthread-2.0 gal-2.2 >= $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)
 AC_SUBST(CAMEL_CFLAGS)
 AC_SUBST(CAMEL_LIBS)
+
+EVO_SET_COMPILE_FLAGS(CAMEL_GROUPWISE, libegroupwise-1.0 >= $EDS_REQUIRED,
+		      $CAMEL_CFLAGS,
+	              $CAMEL_LIBS)
+AC_SUBST(CAMEL_GROUPWISE_CFLAGS)
+AC_SUBST(CAMEL_GROUPWISE_LIBS)
 
 if test "x$mozilla_nss" != "x"; then
    EVO_SET_COMPILE_FLAGS(MOZILLA_NSS, $mozilla_nss)