Mesa (master): configure: warn about shared_glapi & xlib-glx only when both are set

Emil Velikov evelikov at kemper.freedesktop.org
Tue Jun 23 16:07:39 UTC 2015


Module: Mesa
Branch: master
Commit: 6d744aaf4e427b6b0b3d8d35d756592a50abbb97
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6d744aaf4e427b6b0b3d8d35d756592a50abbb97

Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Fri Jun 19 17:19:46 2015 +0100

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 at lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Eric Anholt <eric at anholt.net>

---

 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 3c763c2..5161361 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




More information about the mesa-commit mailing list