From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Fri, 19 Jun 2015 16:19:46 +0000 (+0100)
Subject: configure: warn about shared_glapi & xlib-glx only when both are set
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6d744aaf4e427b6b0b3d8d35d756592a50abbb97;p=mesa.git

configure: warn about shared_glapi & xlib-glx only when both are set

Printing out the message when shared_glapi is disabled only leads to
confusion.

Cc: "10.5 10.6" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
---

diff --git a/configure.ac b/configure.ac
index 3c763c27b9f..5161361908d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -942,7 +942,7 @@ x*yes*yes*)
 esac
 
 # Building Xlib-GLX requires shared glapi to be disabled.
-if test "x$enable_xlib_glx" = xyes; then
+if test "x$enable_shared_glapi$enable_xlib_glx" = xyesyes; then
     AC_MSG_NOTICE([Shared GLAPI should not used with Xlib-GLX, disabling])
     enable_shared_glapi=no
 fi