Mesa (staging/18.2): autotools: error out when using the broken --with-{gl, osmesa}-lib-name
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Aug 9 00:50:37 UTC 2018
Module: Mesa
Branch: staging/18.2
Commit: 33ac5fb67829b494a78806fc07b8824cbd29bb9e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=33ac5fb67829b494a78806fc07b8824cbd29bb9e
Author: Emil Velikov <emil.velikov at collabora.com>
Date: Fri Feb 23 19:32:04 2018 +0000
autotools: error out when using the broken --with-{gl, osmesa}-lib-name
The toggles were broken with the introduction of --enable-mangling.
Fixing that up might be possible, but it's not worth the complexity
since one can rename the libraries at any point.
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>
(cherry picked from commit d5ac23647110fd530f9bf5002762587be446866d)
---
configure.ac | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index 8937d23823..8f5911ab69 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1503,15 +1503,15 @@ fi
AC_ARG_WITH([gl-lib-name],
[AS_HELP_STRING([--with-gl-lib-name@<:@=NAME@:>@],
[specify GL library name @<:@default=GL@:>@])],
- [GL_LIB=$withval],
- [GL_LIB="$DEFAULT_GL_LIB_NAME"])
+ [AC_MSG_ERROR([--with-gl-lib-name is no longer supported. Rename the library manually if needed.])],
+ [])
AC_ARG_WITH([osmesa-lib-name],
[AS_HELP_STRING([--with-osmesa-lib-name@<:@=NAME@:>@],
[specify OSMesa library name @<:@default=OSMesa@:>@])],
- [OSMESA_LIB=$withval],
- [OSMESA_LIB=OSMesa])
-AS_IF([test "x$GL_LIB" = xyes], [GL_LIB="$DEFAULT_GL_LIB_NAME"])
-AS_IF([test "x$OSMESA_LIB" = xyes], [OSMESA_LIB=OSMesa])
+ [AC_MSG_ERROR([--with-osmesa-lib-name is no longer supported. Rename the library manually if needed.])],
+ [])
+GL_LIB="$DEFAULT_GL_LIB_NAME"
+OSMESA_LIB=OSMesa
dnl
dnl Mangled Mesa support
More information about the mesa-commit
mailing list