[Xfce4-commits] <midori:master> Explicitly link to X11 to not rely on indirect library linking

[Christian Dywan]

Updating branch refs/heads/master
         to 42174b473aeea9a649b9410e997980d69ace9239 (commit)
       from 5417a4f52bd6413baba3bb232364c69fd411ebec (commit)

commit 42174b473aeea9a649b9410e997980d69ace9239
Author: Yves-Alexis Perez <corsac at debian.org>
Date:   Wed Nov 11 23:41:08 2009 +0100

    Explicitly link to X11 to not rely on indirect library linking
    
    It is recommended by Debian and required for the gold linker.

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

diff --git a/midori/wscript_build b/midori/wscript_build
index 2d1ae2c..dd8c3a1 100644
--- a/midori/wscript_build
+++ b/midori/wscript_build
@@ -19,7 +19,7 @@ obj.name = 'panels'
 obj.target = 'panels'
 obj.includes = '. ..'
 obj.find_sources_in_dirs ('../panels')
-obj.uselib = 'UNIQUE LIBSOUP GMODULE GTHREAD GIO GTK SQLITE WEBKIT LIBXML'
+obj.uselib = 'UNIQUE LIBSOUP GMODULE GTHREAD GIO GTK SQLITE WEBKIT LIBXML X11'
 obj.uselib_local = 'midori-core'
 obj.install_path = None
 
diff --git a/wscript b/wscript
index e686b13..6dd8b61 100644
--- a/wscript
+++ b/wscript
@@ -137,6 +137,9 @@ def configure (conf):
 
         Utils.pprint ('BLUE', 'Mingw recognized, assuming cross compile.')
 
+    if Options.platform != 'win32':
+        conf.check_cc (lib='X11', uselib='X11')
+
     if conf.env['CONVERT'] and not conf.env['WINRC']:
         Utils.pprint ('YELLOW', 'midori.ico won\'t be created')