Sorry, life's extremely busy for me. Looks good at a glance. I didn't check if GL is hardcoded in spots where $(GL_LIB) should be used or anything like that, though. Reviewed-by: Dan Nicholson <<a href="mailto:dbn.lists@gmail.com">dbn.lists@gmail.com</a>> <div class="gmail_quote">On Oct 12, 2011 1:30 PM, "tom fogal" <<a href="mailto:tfogal@sci.utah.edu">tfogal@sci.utah.edu</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> *ping* any review? Dan, I think you're probably the best to review this, if you have a minute. -tom <a href="mailto:tfogal@sci.utah.edu">tfogal@sci.utah.edu</a> writes: > From: Tom Fogal <<a href="mailto:tfogal@alumni.unh.edu">tfogal@alumni.unh.edu</a>> > > In addition to setting up the flags correctly, this renames the > generated libraries to ensure they get 'Mangled' in the name. > This is very useful for distros and the like, where mangled Mesa > and non-mangled GL libraries typically need to be installed > side-by-side. > --- > configs/<a href="http://autoconf.in" target="_blank">autoconf.in</a> | 4 ++-- > <a href="http://configure.ac" target="_blank">configure.ac</a> | 27 ++++++++++++++++++++++++--- > 2 files changed, 26 insertions(+), 5 deletions(-) > > diff --git a/configs/<a href="http://autoconf.in" target="_blank">autoconf.in</a> b/configs/<a href="http://autoconf.in" target="_blank">autoconf.in</a> > index 9bbafc9..96fe5da 100644 > --- a/configs/<a href="http://autoconf.in" target="_blank">autoconf.in</a> > +++ b/configs/<a href="http://autoconf.in" target="_blank">autoconf.in</a> > @@ -64,8 +64,8 @@ FLEX = @FLEX@ > BISON = @BISON@ > > # Library names (base name) > -GL_LIB = GL > -GLU_LIB = GLU > +GL_LIB = @GL_LIB@ > +GLU_LIB = @GLU_LIB@ > GLW_LIB = GLw > OSMESA_LIB = @OSMESA_LIB@ > GLESv1_CM_LIB = GLESv1_CM > diff --git a/<a href="http://configure.ac" target="_blank">configure.ac</a> b/<a href="http://configure.ac" target="_blank">configure.ac</a> > index 49e81ad..df909dd 100644 > --- a/<a href="http://configure.ac" target="_blank">configure.ac</a> > +++ b/<a href="http://configure.ac" target="_blank">configure.ac</a> > @@ -342,6 +342,28 @@ else > fi > > dnl > +dnl Mangled Mesa support > +dnl > +AC_ARG_ENABLE([mangling], > + [AS_HELP_STRING([--enable-mangling], > + [enable mangled symbols and library name @<:@default=disabled@:>@])], > + [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" > +fi > +AC_SUBST([GL_LIB]) > +AC_SUBST([GLU_LIB]) > +AC_SUBST([OSMESA_LIB]) > + > +dnl > dnl potentially-infringing-but-nobody-knows-for-sure stuff > dnl > AC_ARG_ENABLE([texture-float], > @@ -1280,17 +1302,16 @@ if test "x$osmesa_bits" != x8; then > fi > case "x$osmesa_bits" in > x8) > - OSMESA_LIB=OSMesa > + OSMESA_LIB="${OSMESA_LIB}" > ;; > x16|x32) > - OSMESA_LIB="OSMesa$osmesa_bits" > + OSMESA_LIB="${OSMESA_LIB}$osmesa_bits" > DEFINES="$DEFINES -DCHAN_BITS=$osmesa_bits -DDEFAULT_SOFTWARE_DEPTH_BITS > =31" > ;; > *) > AC_MSG_ERROR([OSMesa bits '$osmesa_bits' is not a valid option]) > ;; > esac > -AC_SUBST([OSMESA_LIB]) > > if test "x$enable_osmesa" = xyes; then > # only link libraries with osmesa if shared > -- > 1.7.3.4 </blockquote></div>