diff --git a/configure.ac b/configure.ac index fafcf134e8..2e4c179aff 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