From d506dacc6b2ee8f7aab67aa6fd6e1b90e5830679 Mon Sep 17 00:00:00 2001
From: Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
Date: Wed, 10 Apr 2019 13:59:05 +0200
Subject: build: configure: delay USE_GTK conditional until check libva-x11

libva-x11 is used for X11 applications, so it is required to build
any GTK application.

Later, when Wayland test is added, we should change this.
---
 configure.ac | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index fafcf134..2e4c179a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -495,7 +495,7 @@ AS_IF([test $USE_GTK -eq 1],
     AC_CHECK_HEADERS([gtk/gtk.h], [], [USE_GTK=0])
     CPPFLAGS="$saved_CPPFLAGS"
   ])
-AM_CONDITIONAL([USE_GTK], [test $USE_GTK -eq 1])
+dnl USE_GTK conditional is delayed after being sure to handle X11
 
 dnl ---------------------------------------------------------------------------
 dnl -- VA-API                                                                --
@@ -528,6 +528,9 @@ if test $USE_X11 -eq 1; then
     ])
 fi
 
+dnl export USE_GTK after being sure to handle X11
+AM_CONDITIONAL([USE_GTK], [test $USE_X11 -eq 1 -a $USE_GTK -eq 1])
+
 dnl Check for encoding support
 USE_ENCODERS=0
 if test "x$enable_encoders" = "xyes"; then
-- 
cgit v1.2.3