From 8212fc95b59d0dd3cae1fe11359e0fa96d75e1bc Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Wed, 3 May 2017 15:57:31 +0100 Subject: [PATCH] configure: error out when building GLX w/o the X11 platform Building EGL/Vulkan/other without X11, while GLX is enabled is confusing and misleading. In practise anyone aiming at the former will also disable GLX. The inverse (some examples below) should still work: ./configure --disable-glx --with-platforms=x11 --with-vulkan-drivers=intel ./configure --disable-glx --with-platforms=x11 --enable-egl Keep in mind that the X11 platform is enabled, by default. Cc: Signed-off-by: Emil Velikov Reviewed-by: Eric Engestrom --- configure.ac | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac index 56521127b4c..e6dcea73293 100644 --- a/configure.ac +++ b/configure.ac @@ -1719,6 +1719,12 @@ for plat in $platforms; do esac done +if test "x$enable_glx" != xno; then + if ! echo "$platforms" | grep -q 'x11'; then + AC_MSG_ERROR([Building without the x11 platform as GLX is enabled, is not supported]) + fi +fi + AM_CONDITIONAL(HAVE_PLATFORM_X11, echo "$platforms" | grep -q 'x11') AM_CONDITIONAL(HAVE_PLATFORM_WAYLAND, echo "$platforms" | grep -q 'wayland') AM_CONDITIONAL(HAVE_PLATFORM_DRM, echo "$platforms" | grep -q 'drm') -- 2.30.2