Fix Gtk+ < 2.13 and GIO build

diff --git a/configure.in b/configure.in
index b95e8b7190d7ac26477d5331944dfd44a3f40fc4..17ad974c979a1cea490b1fc822b890939dfcbc11 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -38,6 +38,14 @@ if test x"$enable_debug" = x"yes"; then
   ])
 fi
 
+# Checks for GIO2
+PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.16, have_gio=true, have_gio=false)
+if test "x${have_gio}" = "xfalse" ; then
+    AC_MSG_ERROR([No GIO2 package information found])
+fi
+AC_SUBST(GIO_CFLAGS)
+AC_SUBST(GIO_LIBS)
+
 # Checks for GTK+2
 PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6, have_gtk=true, have_gtk=false)
 if test "x${have_gtk}" = "xfalse" ; then

diff --git a/midori/Makefile.am b/midori/Makefile.am
index 91fa7b896f524148a3f3ac0eff7896ce4f85489f..69c8d133a2dac3fbba32307e942dde5129812c16 100644 (file)
--- a/midori/Makefile.am
+++ b/midori/Makefile.am
@@ -1,4 +1,5 @@
 INCLUDES = \
+    $(GIO_CFLAGS)     \
     $(GTK_CFLAGS)     \
     $(WEBKIT_CFLAGS)  \
     $(LIBSEXY_CFLAGS) \
@@ -7,6 +8,7 @@ INCLUDES = \
 AM_CFLAGS = -DMIDORI_LOCALEDIR=\""$(localedir)"\"
 
 LDADD = \
+    $(GIO_LIBS)          \
     $(GTK_LIBS)          \
     $(WEBKIT_LIBS)       \
     $(LIBSEXY_LIBS)      \

diff --git a/midori/compat.h b/midori/compat.h
index de818e8a644bbf5dedf8f6ac2e7c032b7b1d135a..415b6b74c5e668e59ad28af684a62bbaa1ca21fb 100644 (file)
--- a/midori/compat.h
+++ b/midori/compat.h
@@ -12,7 +12,7 @@
 #ifndef __COMPAT_H__
 #define __COMPAT_H__
 
-#include "glib.h"
+#include <glib.h>
 #if GLIB_CHECK_VERSION(2, 16, 0)
 #include <gio/gio.h>
 #endif
@@ -22,6 +22,8 @@ G_BEGIN_DECLS
 
 #if !GTK_CHECK_VERSION(2, 14, 0)
 
+#if GLIB_CHECK_VERSION(2,16, 0)
+
 GdkPixbuf*
 gdk_pixbuf_new_from_stream (GInputStream* stream,
                             GCancellable* cancellable,
@@ -29,6 +31,8 @@ gdk_pixbuf_new_from_stream (GInputStream* stream,
 
 #endif
 
+#endif
+
 #if !GTK_CHECK_VERSION(2, 12, 0)
 
 void

diff --git a/midori/wscript_build b/midori/wscript_build
index df741850569f9f16b04b3a3a8d327b8b4b217084..228342de99b5c4c6bd718cdcf27c70487d3070fa 100644 (file)
--- a/midori/wscript_build
+++ b/midori/wscript_build
@@ -5,5 +5,5 @@ obj = bld.create_obj ('cc', 'program')
 obj.target = 'midori'
 obj.includes = '.. ../katze'
 obj.find_sources_in_dirs ('.')
-obj.uselib = 'GTK WEBKIT LIBXML LIBSEXY'
+obj.uselib = 'GIO GTK WEBKIT LIBXML LIBSEXY'
 obj.uselib_local = 'katze'

diff --git a/wscript b/wscript
index 17fa3af1a6760949fbb0910629e78f4633b66225..45380fe768b9d6a6f96c20f7fbb1eabe6a541275 100644 (file)
--- a/wscript
+++ b/wscript
@@ -35,6 +35,7 @@ def configure (conf):
         nls = 'no'
     conf.check_message_custom ('localization', 'support', nls)
 
+    conf.check_pkg ('gio-2.0', destvar='GIO', vnum='2.16.0', mandatory=False)
     conf.check_pkg ('gtk+-2.0', destvar='GTK', vnum='2.6.0', mandatory=True)
     conf.check_pkg ('webkit-1.0', destvar='WEBKIT', vnum='0.1', mandatory=True)
     conf.check_pkg ('libxml-2.0', destvar='LIBXML', vnum='2.6', mandatory=True)