[Mesa-dev] [PATCH 1/2] configure: loosen --enable-glvnd check to honour egl

[Eric Engestrom]

On Tuesday, 2017-10-31 18:58:09 +0000, Emil Velikov wrote:
> From: Emil Velikov <emil.velikov at collabora.com>
> 
> Currently we error out when building GLVND w/o GLX.
> 
> That was the original premice before we had EGL. As the commit says,
> that error should be reworked to honour both - do so.
> 
> Reported-by: Lukas Rusak <lorusak at gmail.com>
> Cc: Lukas Rusak <lorusak at gmail.com>
> Fixes: ce562f9e3fa ("EGL: Implement the libglvnd interface for EGL (v3)")
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> ---
>  configure.ac | 12 +++++-------
>  1 file changed, 5 insertions(+), 7 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 9aa02f55ded..945241bcb0e 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1383,17 +1383,11 @@ AC_ARG_ENABLE([libglvnd],
>  AM_CONDITIONAL(USE_LIBGLVND, test "x$enable_libglvnd" = xyes)
>  
>  if test "x$enable_libglvnd" = xyes ; then
> -    dnl XXX: update once we can handle more than libGL/glx.
> -    dnl Namely: we should error out if neither of the glvnd enabled libraries
> -    dnl are built
>      case "x$enable_glx" in
> -    xno)
> -        AC_MSG_ERROR([cannot build libglvnd without GLX])
> -        ;;
>      xxlib | xgallium-xlib )
>          AC_MSG_ERROR([cannot build libgvnd when Xlib-GLX or Gallium-Xlib-GLX is enabled])
>          ;;
> -    xdri)
> +    *)
>          ;;

`*);;` is a noop and can be dropped

both your patches in this series are
Reviewed-by: Eric Engestrom <eric.engestrom at imgtec.com>

>      esac
>  
> @@ -1403,6 +1397,10 @@ if test "x$enable_libglvnd" = xyes ; then
>  
>      DEFINES="${DEFINES} -DUSE_LIBGLVND=1"
>      DEFAULT_GL_LIB_NAME=GLX_mesa
> +
> +    if test "x$enable_glx" = xno -a "x$enable_egl" = xno; then
> +        AC_MSG_ERROR([cannot build libglvnd without GLX or EGL])
> +    fi
>  fi
>  
>  AC_ARG_WITH([gl-lib-name],
> -- 
> 2.14.1
>