Prefer gio-2.0 when requiring GLib libraries.

gio-2.0 is the "top level" library within GLib.

It requires everything else we may need from GLib:

glib-2.0, gobject-2.0, gmodule-2.0, gthread-2.0

4 files changed, 10 insertions, 10 deletions

diff --git a/camel/camel.pc.in b/camel/camel.pc.in
index c0502059f..6a2806e9a 100644
--- a/camel/camel.pc.in
+++ b/camel/camel.pc.in
@@ -9,6 +9,6 @@ privincludedir=@privincludedir@
 Name: camel
 Description: the Evolution MIME message handling library
 Version: @VERSION@
-Requires: glib-2.0 libedataserver-@API_VERSION@ sqlite3 @mozilla_nss@ @mozilla_nspr@
+Requires: gio-2.0 libedataserver-@API_VERSION@ sqlite3 @mozilla_nss@ @mozilla_nspr@
 Libs: -L${libdir} -lcamel-@API_VERSION@ @MANUAL_NSS_LIBS@
 Cflags: -I${privincludedir} @CAMEL_SSL_DEFINES@ @MANUAL_NSS_CFLAGS@
diff --git a/configure.ac b/configure.ac
index 88936bc50..7702b9446 100644
--- a/configure.ac
+++ b/configure.ac
@@ -314,7 +314,7 @@ dnl ***********************************
 dnl Check for base dependencies early.
 dnl ***********************************
 PKG_CHECK_MODULES(GNOME_PLATFORM,
-	[glib-2.0 >= glib_minimum_version
+	[gio-2.0 >= glib_minimum_version
 	$GTK_MODULE
 	gconf-2.0 >= gconf_minimum_version
 	libxml-2.0 >= libxml_minimum_version
@@ -1181,7 +1181,7 @@ AC_DEFUN([EVO_SET_COMPILE_FLAGS], [
 dnl ******************************
 dnl libedataserver flags
 dnl ******************************
-E_DATA_SERVER_DEPS="libxml-2.0 gthread-2.0 libsoup-2.4 gconf-2.0 $mozilla_nspr"
+E_DATA_SERVER_DEPS="gio-2.0 libxml-2.0 libsoup-2.4 gconf-2.0 $mozilla_nspr"
 
 EVO_SET_COMPILE_FLAGS(E_DATA_SERVER, $E_DATA_SERVER_DEPS, $MANUAL_NSPR_CFLAGS, $MANUAL_NSPR_LIBS)
 AC_SUBST(E_DATA_SERVER_CFLAGS)
@@ -1190,13 +1190,13 @@ AC_SUBST(E_DATA_SERVER_LIBS)
 dnl ******************************
 dnl libedataserverui
 dnl ******************************
-E_DATA_SERVER_UI_DEPS="$GTK_PACKAGE libxml-2.0 gobject-2.0 gthread-2.0 gconf-2.0 $GNOME_KEYRING_REQUIREMENT"
+E_DATA_SERVER_UI_DEPS="gio-2.0 $GTK_PACKAGE libxml-2.0 gconf-2.0 $GNOME_KEYRING_REQUIREMENT"
 
 EVO_SET_COMPILE_FLAGS(E_DATA_SERVER_UI, $E_DATA_SERVER_UI_DEPS, , )
 AC_SUBST(E_DATA_SERVER_UI_CFLAGS)
 AC_SUBST(E_DATA_SERVER_UI_LIBS)
 
-E_BACKEND_DEPS="gobject-2.0 libxml-2.0 gmodule-2.0 gconf-2.0"
+E_BACKEND_DEPS="gio-2.0 libxml-2.0 gconf-2.0"
 
 dnl ******************************
 dnl libebackend flags
@@ -1208,7 +1208,7 @@ AC_SUBST(E_BACKEND_LIBS)
 dnl ******************************
 dnl evolution-addressbook flags
 dnl ******************************
-EVOLUTION_ADDRESSBOOK_DEPS="libxml-2.0 gobject-2.0 gthread-2.0 gconf-2.0"
+EVOLUTION_ADDRESSBOOK_DEPS="gio-2.0 libxml-2.0 gconf-2.0"
 
 EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS)
 AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)
@@ -1218,7 +1218,7 @@ dnl ******************************
 dnl evolution-calendar flags
 dnl ******************************
 if test "x${enable_calendar}" = "xyes"; then
-	EVOLUTION_CALENDAR_DEPS="libical >= libical_minimum_version libxml-2.0 gio-2.0 gobject-2.0 gthread-2.0 gconf-2.0"
+	EVOLUTION_CALENDAR_DEPS="gio-2.0 libical >= libical_minimum_version libxml-2.0 gconf-2.0"
 
 dnl *****
 dnl libical.pc from libical-0.43 has a bug in it's CFlags.
@@ -1324,7 +1324,7 @@ fi
 
 AM_CONDITIONAL(ENABLE_LARGEFILE, [test "x$enable_largefile" = "xyes"])
 
-EVO_SET_COMPILE_FLAGS(CAMEL, $mozilla_nss gio-2.0 sqlite3 >= sqlite_minimum_version gthread-2.0, $KRB5_CFLAGS $MANUAL_NSS_CFLAGS $LARGEFILE_CFLAGS, -lz $KRB5_LIBS $MANUAL_NSS_LIBS)
+EVO_SET_COMPILE_FLAGS(CAMEL, gio-2.0 $mozilla_nss sqlite3 >= sqlite_minimum_version, $KRB5_CFLAGS $MANUAL_NSS_CFLAGS $LARGEFILE_CFLAGS, -lz $KRB5_LIBS $MANUAL_NSS_LIBS)
 AC_SUBST(CAMEL_CFLAGS)
 AC_SUBST(CAMEL_LIBS)
 AC_SUBST(CAMEL_GROUPWISE_CFLAGS)
diff --git a/libebackend/libebackend.pc.in b/libebackend/libebackend.pc.in
index 32a7b71b7..bb661ea3b 100644
--- a/libebackend/libebackend.pc.in
+++ b/libebackend/libebackend.pc.in
@@ -10,6 +10,6 @@ privincludedir=@privincludedir@
 Name: libebackend
 Description: Utility library for Evolution Data Server Backends
 Version: @VERSION@
-Requires: glib-2.0
+Requires: gio-2.0
 Libs: -L${libdir} -lebackend-@API_VERSION@
 Cflags: -I${privincludedir}
diff --git a/libedataserver/libedataserver.pc.in b/libedataserver/libedataserver.pc.in
index 06b834c97..9ee5be43f 100644
--- a/libedataserver/libedataserver.pc.in
+++ b/libedataserver/libedataserver.pc.in
@@ -10,6 +10,6 @@ privincludedir=@privincludedir@
 Name: libedataserver
 Description: Utility library for Evolution Data Server
 Version: @VERSION@
-Requires: libxml-2.0 glib-2.0 gconf-2.0 libsoup-2.4
+Requires: gio-2.0 libxml-2.0 gconf-2.0 libsoup-2.4
 Libs: -L${libdir} -ledataserver-@API_VERSION@
 Cflags: -I${privincludedir}