[Xfce4-commits] <midori:master> wscript: Fix check for version of GTK+-2.0

[Christian Dywan]

Updating branch refs/heads/master
         to ccd5b5ac99193eefc1360de6f7712697df64a736 (commit)
       from a6744f64eeb233e57210d107a73fd4de4f08d98c (commit)

commit ccd5b5ac99193eefc1360de6f7712697df64a736
Author: Paul Menzel <paulepanter at users.sourceforge.net>
Date:   Wed Sep 5 08:44:27 2012 +0200

    wscript: Fix check for version of GTK+-2.0
    
    After "Move thumbnail generation into SpeedDial class" building Midori failed.
    
    1. Separately pass each digit of version to `check_version()` to fix the following build error.
    2. Convert module name with `conf.check_cfg (modversion='gtk+-2.0')` to fix the following build error.
    
    Fixes: https://bugs.launchpad.net/midori/+bug/1046172

 wscript |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/wscript b/wscript
index 69a0cc4..1b1988e 100644
--- a/wscript
+++ b/wscript
@@ -268,7 +268,7 @@ def configure (conf):
         check_pkg ('webkit-1.0', '1.1.17', args=args)
         if check_version (conf.check_cfg (modversion='webkit-1.0'), 1, 5, 1):
             check_pkg ('javascriptcoregtk-1.0', '1.5.1', args=args)
-        if check_version ('gtk+-2.0', '2.20.0'):
+        if check_version (conf.check_cfg (modversion='gtk+-2.0'), 2, 20, 0):
             conf.env.append_value ('VALAFLAGS', '-D HAVE_OFFSCREEN')
     conf.env['HAVE_GTK3'] = option_enabled ('gtk3')
     check_pkg ('libsoup-2.4', '2.27.90')