Mesa (master): configure: disable shared glapi when building xlib powered glx

[Emil Velikov]

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

Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Thu Feb 27 18:03:15 2014 +0000

configure: disable shared glapi when building xlib powered glx

With commit 0432aa064b(configure: use shared-glapi when more than one
gl* API is used) we removed "disable shared-glapi when building without
dri" hunk.

In the good old days of classic mesa, dri and xlib-glx were mutually
exclusive thus the hunk made sense.

Currently enable-dri is used as a synonym for a range of things thus
it's more appropriate to handle xlib-glx explicitly.

Fixes a missing symbol '_glapi_Dispatch' in a xlib powered libGL,
build using the following

 ./autogen.sh --enable-xlib-glx --disable-dri --with-gallium-drivers=swrast

Cc: Brian Paul <brianp at vmware.com>
Reported-by: Brian Paul <brianp at vmware.com>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>

---

 configure.ac |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/configure.ac b/configure.ac
index bf288c5..1bd02c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -753,6 +753,12 @@ x*yes*yes*)
     ;;
 esac
 
+# Building Xlib-GLX requires shared glapi to be disabled.
+if test "x$enable_xlib_glx" = xyes; then
+    AC_MSG_NOTICE([Shared GLAPI should not used with Xlib-GLX, disabling])
+    enable_shared_glapi=no
+fi
+
 AM_CONDITIONAL(HAVE_SHARED_GLAPI, test "x$enable_shared_glapi" = xyes)
 
 dnl