Mesa (staging/18.1): autotools: error out when building with mangling and glvnd

[GitLab Mirror]

Module: Mesa
Branch: staging/18.1
Commit: db3ff90efc44458b8767b59fe9bebdca5d1204f9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=db3ff90efc44458b8767b59fe9bebdca5d1204f9

Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Fri Feb 23 19:32:05 2018 +0000

autotools: error out when building with mangling and glvnd

It's not a thing that can work, nor is a wise idea to attempt.

v2: Tweak error message (Dylan)

CC: <mesa-stable at lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Adam Jackson <ajax at redhat.com> (v1)
(cherry picked from commit 25a9450a44b3b572fba81e6cafe33f3367252499)

---

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

diff --git a/configure.ac b/configure.ac
index a845a70165..32e82593cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1531,6 +1531,9 @@ AC_ARG_ENABLE([mangling],
   [enable_mangling=no]
 )
 if test "x${enable_mangling}" = "xyes" ; then
+  if test "x$enable_libglvnd" = xyes; then
+    AC_MSG_ERROR([Conflicting options --enable-mangling and --enable-libglvnd.])
+  fi
   DEFINES="${DEFINES} -DUSE_MGL_NAMESPACE"
   GL_LIB="Mangled${GL_LIB}"
   OSMESA_LIB="Mangled${OSMESA_LIB}"