[Mesa-dev] [PATCH] configure.ac: Disable GLX if OpenGL is not enabled

[Dan Nicholson]

On Jan 31, 2013 2:51 AM, "Michel Dänzer" <michel at daenzer.net> wrote:
>
> From: Michel Dänzer <michel.daenzer at amd.com>
>
> GLX uses mapi/glapi/libglapi.la, which is only built for OpenGL.
>
> Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
> ---
>  configure.ac |    8 ++++++++
>  1 file changed, 8 insertions(+)
>
> diff --git a/configure.ac b/configure.ac
> index cfd52bf..62cc32b 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -701,6 +701,14 @@ if test "x$enable_dri$enable_xlib_glx" = xyesyes;
then
>      AC_MSG_ERROR([DRI and Xlib-GLX cannot be built together])
>  fi
>
> +# Disable GLX if OpenGL is not enabled
> +if test "x$enable_glx" = xyes -a \
> +        "x$enable_opengl" = xno; then
> +    AC_MSG_WARN([OpenGL not enabled, disabling GLX])
> +    enable_glx=no
> +    enable_xlib_glx=no
> +fi

Seems correct. I might prefer this to error, but warn is probably good
enough. The option to disable opengl didn't exist back when these checks
were written.

Reviewed-by: Dan Nicholson <dbn.lists at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20130131/6220cac4/attachment.html>