From 899822c001eb9f0f46a9a25de3bd1dc03d45f724 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sun, 21 Dec 2014 21:55:36 +0100
Subject: old-configure: fix disabling VAAPI GLX with --disable-gl

waf handles this correctly.
---
 old-configure | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/old-configure b/old-configure
index 5fbbd6c5d4..71e08a9aed 100755
--- a/old-configure
+++ b/old-configure
@@ -607,13 +607,8 @@ define_yes_no $_vaapi HAVE_VAAPI_HWACCEL
 
 if test "$_vaapi" = yes ; then
     check_pkg_config "VAAPI VPP" auto VAAPI_VPP 'libva >= 0.34.0'
-
-    check_pkg_config "VAAPI GLX" auto VAAPI_GLX 'libva-glx >= 0.32.0'
-    _vaapi_glx=$(defretval)
 else
     check_yes_no no VAAPI_VPP
-    check_yes_no no VAAPI_GLX
-    _vaapi_glx=no
 fi
 
 check_pkg_config "Xinerama" $_xinerama XINERAMA 'xinerama'
@@ -696,6 +691,10 @@ _vdpau_gl_x11=no
 check_yes_no $_vdpau_gl_x11 VDPAU_GL_X11
 echores "$_vdpau_gl_x11"
 
+_vaapi_glx=no
+(test "$_gl_x11" = yes && test "$_vaapi" = yes) && _vaapi_glx=auto
+check_pkg_config "VAAPI with OpenGL/X11" $_vaapi_glx VAAPI_GLX 'libva-glx >= 0.32.0'
+
 check_pkg_config "SDL 2.0" $_sdl2 SDL2 'sdl2'
 
 check_statement_libs "OSS Audio" $_ossaudio OSS_AUDIO $_soundcard_header "int x = SNDCTL_DSP_SETFRAGMENT;"
-- 
cgit v1.2.3