From 927afa311d4a89b022305508acbf4e7325fe3928 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 21 Apr 2017 07:30:03 +0200
Subject: build: make various x11 protocol extension libs mandatory

Reduces the ifdeffery, which is good and will avoid silent breakages, or
weird behavior if a lib is omitted.

Also reorder the x11_common.c include statements.
---
 wscript | 26 +++++---------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

(limited to 'wscript')

diff --git a/wscript b/wscript
index cea9f9351b..653562732e 100644
--- a/wscript
+++ b/wscript
@@ -579,32 +579,16 @@ video_output_features = [
     } , {
         'name': '--x11',
         'desc': 'X11',
-        'func': check_pkg_config('x11'),
-    } , {
-        'name': '--xss',
-        'desc': 'Xss screensaver extensions',
-        'deps': [ 'x11' ],
-        'func': check_pkg_config('xscrnsaver'),
-    } , {
-        'name': '--xext',
-        'desc': 'X extensions',
-        'deps': [ 'x11' ],
-        'func': check_pkg_config('xext'),
+        'func': check_pkg_config('x11',         '>= 1.0.0',
+                                 'xscrnsaver',  '>= 1.0.0',
+                                 'xext',        '>= 1.0.0',
+                                 'xinerama',    '>= 1.0.0',
+                                 'xrandr',      '>= 1.2.0'),
     } , {
         'name': '--xv',
         'desc': 'Xv video output',
         'deps': [ 'x11' ],
         'func': check_pkg_config('xv'),
-    } , {
-        'name': '--xinerama',
-        'desc': 'Xinerama',
-        'deps': [ 'x11' ],
-        'func': check_pkg_config('xinerama'),
-    }, {
-        'name': '--xrandr',
-        'desc': 'Xrandr',
-        'deps': [ 'x11' ],
-        'func': check_pkg_config('xrandr', '>= 1.2.0'),
     } , {
         'name': '--gl-cocoa',
         'desc': 'OpenGL Cocoa Backend',
-- 
cgit v1.2.3