[Xfce4-commits] <midori:master> Link against webkit2gtk-3.0 if WebKit2 is enabled

[Christian Dywan]

Updating branch refs/heads/master
         to d8d2ae3b6f2a928b24a5435615a92f66d776c2c8 (commit)
       from 0944dbd7fdcd6e753c09e942f8ddd935008af4b5 (commit)

commit d8d2ae3b6f2a928b24a5435615a92f66d776c2c8
Author: André Stösel <andre at stoesel.de>
Date:   Tue Feb 19 19:03:07 2013 +0100

    Link against webkit2gtk-3.0 if WebKit2 is enabled

 midori/wscript_build |    6 +++++-
 wscript              |    1 +
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/midori/wscript_build b/midori/wscript_build
index 0028a0a..3574e7f 100644
--- a/midori/wscript_build
+++ b/midori/wscript_build
@@ -26,7 +26,11 @@ if progressive:
     obj.add_marshal_file ('marshal.list', 'midori_cclosure_marshal')
     obj.install_path = None
     obj.vapi_dirs = '../midori ../katze'
-    obj.packages = 'glib-2.0 gmodule-2.0 gio-2.0 libsoup-2.4 webkitgtk-3.0 posix sqlite3'
+    obj.packages = 'glib-2.0 gmodule-2.0 gio-2.0 libsoup-2.4 posix sqlite3'
+    if bld.env['HAVE_WEBKIT2']:
+        obj.packages += ' webkit2gtk-3.0'
+    else:
+        obj.packages += ' webkitgtk-3.0'
     if bld.env['HAVE_GTK3']:
         obj.packages += ' gtk+-3.0'
     else:
diff --git a/wscript b/wscript
index cefb767..5935cf3 100644
--- a/wscript
+++ b/wscript
@@ -274,6 +274,7 @@ def configure (conf):
                 Utils.pprint ('RED', 'WebKit2/ GTK+3 was not found.\n' \
                     'Pass --disable-webkit2 to build without WebKit2.')
                 sys.exit (1)
+            conf.define ('HAVE_WEBKIT2', 1)
             conf.env.append_value ('VALAFLAGS', '-D HAVE_WEBKIT2')
         else:
             check_pkg ('webkitgtk-3.0', '1.1.17', var='WEBKIT', mandatory=False)