Remove libgnome from libedataserverui depends, and change libgnome-2.0 to

2008-09-24  Ross Burton  <ross@linux.intel.com>

	* configure.in:
	Remove libgnome from libedataserverui depends, and change
	libgnome-2.0 to libbonobo-2.0 for the addressbook and calendar.

	* evolution-data-server.pc.in:
	Remove libgnome-2.0 as it isn't used.

svn path=/trunk/; revision=9602

diff --git a/ChangeLog b/ChangeLog
index 5e395d4..751cb04 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-09-24  Ross Burton  <ross@linux.intel.com>
+
+       * configure.in:
+       Remove libgnome from libedataserverui depends, and change
+       libgnome-2.0 to libbonobo-2.0 for the addressbook and calendar.
+
+       * evolution-data-server.pc.in:
+       Remove libgnome-2.0 as it isn't used.
+
 2008-09-22  Srinivasa Ragavan  <sragavan@novell.com>
 
        * configure.in: Version bump for Evolution Data Server 2.25.1

diff --git a/configure.in b/configure.in
index b39001b..a049161 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1468,7 +1468,7 @@ EVO_SET_COMPILE_FLAGS(E_DATA_SERVER, $E_DATA_SERVER_DEPS, $THREADS_CFLAGS $MANUA
 AC_SUBST(E_DATA_SERVER_CFLAGS)
 AC_SUBST(E_DATA_SERVER_LIBS)
 
-E_DATA_SERVER_UI_DEPS="gtk+-2.0 libglade-2.0 libgnome-2.0 gobject-2.0 gthread-2.0 gconf-2.0 $GNOME_KEYRING_REQUIREMENT"
+E_DATA_SERVER_UI_DEPS="gtk+-2.0 libglade-2.0 gobject-2.0 gthread-2.0 gconf-2.0 $GNOME_KEYRING_REQUIREMENT"
 
 EVO_SET_COMPILE_FLAGS(E_DATA_SERVER_UI, $E_DATA_SERVER_UI_DEPS, $THREADS_CFLAGS, $THREADS_LIBS)
 AC_SUBST(E_DATA_SERVER_UI_CFLAGS)
@@ -1482,7 +1482,7 @@ AC_SUBST(E_BACKEND_LIBS)
 
 dnl --- evolution-addressbook flags
 
-EVOLUTION_ADDRESSBOOK_DEPS="libxml-2.0 libgnome-2.0 gobject-2.0 gthread-2.0 gconf-2.0"
+EVOLUTION_ADDRESSBOOK_DEPS="libxml-2.0 libbonobo-2.0 gobject-2.0 gthread-2.0 gconf-2.0"
 
 EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS)
 AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)
@@ -1490,7 +1490,7 @@ AC_SUBST(EVOLUTION_ADDRESSBOOK_LIBS)
 
 dnl --- evolution-calendar flags
 if test "x${enable_calendar}" = "xyes"; then
-       EVOLUTION_CALENDAR_DEPS="libxml-2.0 libgnome-2.0 gio-2.0 gobject-2.0 gthread-2.0 gconf-2.0"
+       EVOLUTION_CALENDAR_DEPS="libxml-2.0 libbonobo-2.0 gio-2.0 gobject-2.0 gthread-2.0 gconf-2.0"
 
        EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, $EVOLUTION_CALENDAR_DEPS)
        AC_SUBST(EVOLUTION_CALENDAR_CFLAGS)