diff options
| author | Emil Velikov <[email protected]> | 2017-05-03 15:57:31 +0100 |
|---|---|---|
| committer | Juan A. Suarez Romero <[email protected]> | 2017-05-31 22:32:03 +0200 |
| commit | 4c0010e93cf24aa1a0ae87c912dfa469076a2cae (patch) | |
| tree | 878e71fc33c4698607afc199b3e4f0fd4d9e56b2 | |
| parent | 5e2a985a54813159d34913fdb8c9da6d5d245fa4 (diff) | |
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: <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Eric Engestrom <[email protected]>
(cherry picked from commit 8212fc95b59d0dd3cae1fe11359e0fa96d75e1bc)
Signed-off-by: Juan A. Suarez Romero <[email protected]>
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index f166dd20a13..85da8305aeb 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') |