[librsvg] Require gio-2.0

[Christian Persch <chpe src gnome org>]

commit 7ce4e113d8715ade31081cd1763386e26fee4665
Author: Christian Persch <chpe gnome org>
Date:   Tue Jun 22 15:36:01 2010 +0200

    Require gio-2.0

 configure.in  |   17 ++---------------
 librsvg.pc.in |    2 +-
 rsvg-image.c  |    7 -------
 3 files changed, 3 insertions(+), 23 deletions(-)
---
diff --git a/configure.in b/configure.in
index 95cc79c..05f98ce 100644
--- a/configure.in
+++ b/configure.in
@@ -19,7 +19,7 @@ dnl ===========================================================================
 
 FONTCONFIG_REQUIRED=1.0.1	dnl Same as in Pango, ???
 GLIB_REQUIRED=2.12.0
-GIO_REQUIRED=2.15.4
+GIO_REQUIRED=2.16.0
 LIBXML_REQUIRED=2.4.7
 CAIRO_REQUIRED=1.2.0
 PANGOFT2_REQUIRED=1.2.0
@@ -122,6 +122,7 @@ AC_SUBST(GLIB_MKENUMS)
 PKG_CHECK_MODULES(LIBRSVG, \
 	gdk-pixbuf-$GTK_API_VERSION >= $GDK_PIXBUF_REQUIRED \
 	glib-2.0 >= $GLIB_REQUIRED \
+	gio-2.0 >= $GIO_REQUIRED \
 	libxml-2.0 >= $LIBXML_REQUIRED \
 	pangoft2 >= $PANGOFT2_REQUIRED \
 	pangocairo >= $PANGOCAIRO_REQUIRED \
@@ -130,19 +131,6 @@ PKG_CHECK_MODULES(LIBRSVG, \
 	fontconfig >= $FONTCONFIG_REQUIRED
 	freetype2)
 
-test_gio=true
-PKG_CHECK_EXISTS(gio-2.0 >= $GIO_REQUIRED, [
-	PKG_CHECK_MODULES(GIO, gio-2.0 >= $GIO_REQUIRED)
-	LIBRSVG_CFLAGS="$LIBRSVG_CFLAGS $GIO_CFLAGS"
-	LIBRSVG_LIBS="$LIBRSVG_LIBS $GIO_LIBS"
-	AC_DEFINE(HAVE_GIO, 1, [Defined if gio is avaiable])
-],[
-	test_gio=false
-])
-
-AC_SUBST(LIBRSVG_LIBS)
-AC_SUBST(LIBRSVG_CFLAGS)
-
 dnl ===========================================================================
 
 LIBGSF_CFLAGS=""
@@ -389,7 +377,6 @@ librsvg-$VERSION for gtk+-$GTK_API_VERSION
 	Build theme engine:             ${enable_gtk_theme}
 	Build miscellaenous tools:      ${build_misc_tools}
 	Handle svgz files:              ${test_gsf}
-	Use GIO:                        ${test_gio}
 	Use libcroco for css parsing:   ${test_croco}
 "
 
diff --git a/librsvg.pc.in b/librsvg.pc.in
index d2747b0..6e34580 100644
--- a/librsvg.pc.in
+++ b/librsvg.pc.in
@@ -10,6 +10,6 @@ Name: librsvg
 Description: library that renders svg files
 Version: @VERSION@
 Requires: glib-2.0 gdk-pixbuf- GTK_API_VERSION@ cairo
-Requires.private:
+Requires.private: gio-2.0
 Libs: -L${libdir} -lrsvg- RSVG_API_MAJOR_VERSION@ -lm
 Cflags: -I${includedir}/librsvg- RSVG_API_VERSION@
diff --git a/rsvg-image.c b/rsvg-image.c
index 453e58c..a81dcf5 100644
--- a/rsvg-image.c
+++ b/rsvg-image.c
@@ -34,9 +34,7 @@
 #include <math.h>
 #include <errno.h>
 #include "rsvg-css.h"
-#ifdef HAVE_GIO
 #include <gio/gio.h>
-#endif
 
 static GByteArray *
 rsvg_acquire_base64_resource (const char *data, GError ** error)
@@ -117,8 +115,6 @@ rsvg_acquire_file_resource (const char *filename, const char *base_uri, GError *
     return array;
 }
 
-#ifdef HAVE_GIO
-
 static GByteArray *
 rsvg_acquire_vfs_resource (const char *filename, const char *base_uri, GError ** error)
 {
@@ -162,7 +158,6 @@ rsvg_acquire_vfs_resource (const char *filename, const char *base_uri, GError **
 
     return array;
 }
-#endif
 
 GByteArray *
 _rsvg_acquire_xlink_href_resource (const char *href, const char *base_uri, GError ** err)
@@ -178,10 +173,8 @@ _rsvg_acquire_xlink_href_resource (const char *href, const char *base_uri, GErro
     if (!arr)
         arr = rsvg_acquire_file_resource (href, base_uri, NULL);
 
-#ifdef HAVE_GIO
     if (!arr)
         arr = rsvg_acquire_vfs_resource (href, base_uri, NULL);
-#endif
 
     return arr;
 }