Mesa (master): configure.ac: Add --with-(gl|glu|osmesa)-lib-name options
Eric Anholt
anholt at kemper.freedesktop.org
Mon Jun 11 16:32:07 UTC 2012
Module: Mesa
Branch: master
Commit: f3cdcb839f534a3062864b06ec6689717ed102a1
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f3cdcb839f534a3062864b06ec6689717ed102a1
Author: Brad King <brad.king at kitware.com>
Date: Tue Jun 5 13:59:58 2012 -0400
configure.ac: Add --with-(gl|glu|osmesa)-lib-name options
These allow one to mangle the library names, without also mangling the
symbol names, to make them distinct from other GL libraries on the
system.
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
---
configure.ac | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/configure.ac b/configure.ac
index 4f346ef..88a2df6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -350,6 +350,24 @@ else
LIB_EXTENSION='so' ;;
esac
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=GL])
+AC_ARG_WITH([glu-lib-name],
+ [AS_HELP_STRING([--with-glu-lib-name@<:@=NAME@:>@],
+ [specify GLU library name @<:@default=GLU@:>@])],
+ [GLU_LIB=$withval],
+ [GLU_LIB=GLU])
+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=GL])
+AS_IF([test "x$GLU_LIB" = xyes], [GLU_LIB=GLU])
+AS_IF([test "x$OSMESA_LIB" = xyes], [OSMESA_LIB=OSMesa])
dnl
dnl Mangled Mesa support
@@ -360,19 +378,16 @@ AC_ARG_ENABLE([mangling],
[enable_mangling="${enableval}"],
[enable_mangling=no]
)
-GL_LIB="GL"
-GLU_LIB="GLU"
-OSMESA_LIB="OSMesa"
if test "x${enable_mangling}" = "xyes" ; then
DEFINES="${DEFINES} -DUSE_MGL_NAMESPACE"
- GL_LIB="MangledGL"
- GLU_LIB="MangledGLU"
- OSMESA_LIB="MangledOSMesa"
+ GL_LIB="Mangled${GL_LIB}"
+ GLU_LIB="Mangled${GLU_LIB}"
+ OSMESA_LIB="Mangled${OSMESA_LIB}"
fi
AC_SUBST([GL_LIB])
AC_SUBST([GLU_LIB])
AC_SUBST([OSMESA_LIB])
-AM_CONDITIONAL(HAVE_MANGLED_GL, test $GL_LIB = MangledGL)
+AM_CONDITIONAL(HAVE_MANGLED_GL, test "x${enable_mangling}" = "xyes")
dnl
dnl potentially-infringing-but-nobody-knows-for-sure stuff
More information about the mesa-commit
mailing list