Explicitly link to X11 to not rely on indirect library linking

It is recommended by Debian and required for the gold linker.

diff --git a/midori/wscript_build b/midori/wscript_build
index 2d1ae2c912e75eca1acabfda06e32b707ace265d..dd8c3a15fa9083519b7cc84bb547fd2aaaa0d443 100644 (file)
--- 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 e686b1343b8e6538da3ea4bdd2fa7a3e8a694f28..6dd8b61085a02573c9bcfe534009cb25ad2bb5cd 100644 (file)
--- 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')