From 0432aa064bf5d4d0ad8fc3c4d648b8feb238ddfa Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Wed, 19 Feb 2014 00:54:04 +0000 Subject: [PATCH] configure: use shared-glapi when more than one gl* API is used Current behaviour states that shared-glapi is usefull when building with dri, which is not the case. Shared-glapi is used to dispatch the gl* functions across the one or more gl api's which can be dri based but do not need to be. Fixed the following build ./configure --enable-gles2 --disable-dri --enable-gallium-egl \ --with-egl-platforms=fbdev --with-gallium-drivers=swrast Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75098 Signed-off-by: Emil Velikov Reviewed-by: Eric Anholt --- configure.ac | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index ed7f6b7fb5e..08aed4e30c5 100644 --- a/configure.ac +++ b/configure.ac @@ -727,13 +727,16 @@ AC_ARG_ENABLE([shared-glapi], [AS_HELP_STRING([--enable-shared-glapi], [Enable shared glapi for OpenGL @<:@default=yes@:>@])], [enable_shared_glapi="$enableval"], - [enable_shared_glapi="$enable_dri"]) + [enable_shared_glapi=yes]) -# Shared GLAPI is only useful for DRI -if test "x$enable_dri" = xno; then - AC_MSG_NOTICE([Shared GLAPI is only useful for DRI, disabling]) - enable_shared_glapi=no -fi +case "x$enable_opengl$enable_gles1$enable_gles2" in +x*yes*yes*) + if test "x$enable_shared_glapi" = xno; then + AC_MSG_ERROR([shared GLAPI required when building two or more of + the following APIs - opengl, gles1 gles2]) + fi + ;; +esac AM_CONDITIONAL(HAVE_SHARED_GLAPI, test "x$enable_shared_glapi" = xyes) -- 2.30.2