Explicitly build with GIO again, Gtk < 2.14 needs that

diff --git a/midori/wscript_build b/midori/wscript_build
index f5cfe69df5f43ab9658cb9ea3223332b6120bc47..a855e98a1ab2492f9b0cecc94931ffce08650a5f 100644 (file)
--- a/midori/wscript_build
+++ b/midori/wscript_build
@@ -6,5 +6,5 @@ obj = bld.create_obj ('cc', 'program')
 obj.target = 'midori'
 obj.includes = '. ..'
 obj.find_sources_in_dirs ('.')
-obj.uselib = 'UNIQUE LIBSOUP GTK GTKSOURCEVIEW SQLITE WEBKIT LIBXML'
+obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML'
 obj.uselib_local = 'katze'

diff --git a/wscript b/wscript
index 13e38328011884f02684f081e5e0f5a57baa0264..5b2e876c9fb9f6aa395f459691cf62d4760bd28c 100644 (file)
--- a/wscript
+++ b/wscript
@@ -111,6 +111,7 @@ def configure (conf):
         sqlite = 'no'
     conf.check_message_custom ('history database', 'support', sqlite)
 
+    conf.check_pkg ('gio-2.0', destvar='GIO', vnum='2.16.0', mandatory=False)
     conf.check_pkg ('gtk+-2.0', destvar='GTK', vnum='2.10.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)