[Xfce4-commits] <midori:master> Use pkgconfig to locate X11, which takes correct paths into account on BSD

[Christian Dywan]

Updating branch refs/heads/master
         to 204f0fd98a473df367579266e71a27d4da5c7598 (commit)
       from 42174b473aeea9a649b9410e997980d69ace9239 (commit)

commit 204f0fd98a473df367579266e71a27d4da5c7598
Author: Christian Dywan <christian at twotoasts.de>
Date:   Thu Nov 12 21:53:02 2009 +0100

    Use pkgconfig to locate X11, which takes correct paths into account on BSD

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

diff --git a/wscript b/wscript
index 6dd8b61..6bd1cce 100644
--- a/wscript
+++ b/wscript
@@ -137,9 +137,6 @@ 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')
 
@@ -200,6 +197,8 @@ def configure (conf):
     args = ''
     if Options.platform == 'win32':
         args = '--define-variable=target=win32'
+    elif sys.platform != 'darwin':
+        check_pkg ('x11')
     check_pkg ('gtk+-2.0', '2.10.0', var='GTK', args=args)
     check_pkg ('webkit-1.0', '1.1.1', args=args)
     check_pkg ('libsoup-2.4', '2.25.2')