evolution-data-server r10108 - in trunk: . servers/google/libgdata servers/google/libgdata-google

[mbarnes svn gnome org]

Author: mbarnes
Date: Fri Feb 27 12:44:21 2009
New Revision: 10108
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=10108&view=rev

Log:
2009-02-27  Matthew Barnes  <mbarnes redhat com>

	** Re-fixes bug #570696

	* configure.in:
	Define GDATA_CFLAGS and GDATA_LIBS and explicitly require
	libsoup-2.4 and libxml-2.0.

	* servers/google/libgdata/Makefile.am:
	* servers/google/libgdata-google/Makefile.am:
	Replace SOUP_CFLAGS and SOUP_LIBS with GDATA_CFLAGS and GDATA_LIBS.



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/servers/google/libgdata-google/ChangeLog
   trunk/servers/google/libgdata-google/Makefile.am
   trunk/servers/google/libgdata/ChangeLog
   trunk/servers/google/libgdata/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Feb 27 12:44:21 2009
@@ -1563,6 +1563,12 @@
 AC_SUBST(E_FACTORY_CFLAGS)
 AC_SUBST(E_FACTORY_LIBS)
 
+dnl --- Google flags
+GDATA_DEPS="libsoup-2.4 libxml-2.0"
+EVO_SET_COMPILE_FLAGS(GDATA, $GDATA_DEPS)
+AC_SUBST(GDATA_CFLAGS)
+AC_SUBST(GDATA_LIBS)
+
 dnl --- Groupwise flags
 LIBSOUP_REQUIRED=libsoup_minimum_version
 AC_SUBST(LIBSOUP_REQUIRED)

Modified: trunk/servers/google/libgdata-google/Makefile.am
==============================================================================
--- trunk/servers/google/libgdata-google/Makefile.am	(original)
+++ trunk/servers/google/libgdata-google/Makefile.am	Fri Feb 27 12:44:21 2009
@@ -3,7 +3,7 @@
 	-I$(top_srcdir)						\
 	-I$(top_builddir)					\
 	-I$(top_srcdir)/servers/google/libgdata			\
-	$(SOUP_CFLAGS)
+	$(GDATA_CFLAGS)
 
 lib_LTLIBRARIES = libgdata-google-1.2.la
 
@@ -13,7 +13,7 @@
 
 libgdata_google_1_2_la_LIBADD =					\
 	$(top_builddir)/servers/google/libgdata/libgdata-1.2.la	\
-	$(SOUP_LIBS)
+	$(GDATA_LIBS)
 
 libgdata_google_1_2_la_LDFLAGS =	                       \
         -version-info $(LIBGDATA_GOOGLE_CURRENT):$(LIBGDATA_GOOGLE_REVISION):$(LIBGDATA_GOOGLE_AGE) $(NO_UNDEFINED)

Modified: trunk/servers/google/libgdata/Makefile.am
==============================================================================
--- trunk/servers/google/libgdata/Makefile.am	(original)
+++ trunk/servers/google/libgdata/Makefile.am	Fri Feb 27 12:44:21 2009
@@ -2,7 +2,7 @@
 	-DG_LOG_DOMAIN=\"libgdata\"			\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
-	$(SOUP_CFLAGS)
+	$(GDATA_CFLAGS)
 
 lib_LTLIBRARIES = libgdata-1.2.la
 
@@ -15,7 +15,7 @@
 	gdata-service-iface.h			
 
 libgdata_1_2_la_LIBADD =			\
-	$(SOUP_LIBS)
+	$(GDATA_LIBS)
 
 libgdata_1_2_la_LDFLAGS =                       \
         -version-info $(LIBGDATA_CURRENT):$(LIBGDATA_REVISION):$(LIBGDATA_AGE) $(NO_UNDEFINED)