[Mesa-dev] [PATCH] automake: Honor GL_LIB for mangled/custom lib names

[Dan Nicholson]

On 7/11/12, Brad King <brad.king at kitware.com> wrote:
> Commit 2d4b77c7 (automake: Convert src/mesa/drivers/x11/Makefile to
> automake, 2012-06-12) dropped the old Makefile, which used GL_LIB, and
> replaced it with a Makefile.am hard-coding the name "GL".  This broke
> handling of --enable-mangling and --with-gl-lib-name options which
> depend on GL_LIB to specify the GL library name.
>
> Use "@GL_LIB@" in src/mesa/drivers/x11/Makefile.am to configure the
> library name.  Also simplify src/glx/Makefile.am using this approach.
> While at it, fix the compatibility link we create in "lib" for the
> software-only driver to use version GL_MAJOR instead of hard-coding "1".
> ---
>
> On 07/11/2012 11:24 AM, Eric Anholt wrote:
>> Brad King <brad.king at kitware.com> writes:
>>> Upon closer inspection it *does* obviously drop use of GL_LIB.
>>> Now "libGL" is hard-coded in "Makefile.am".  Naive replacement
>>> like that below is not valid automake code AFAICT.  I'm not
>>> familiar enough with automake to know how to make the library
>>> name configurable.  Does anyone know?
>>
>> For the OSMesa changes, Laurent Carlier used @OSMESA_LIB@, so if you did
>> this patch using @GL_LIB@, it would at least be consistent with that.
>
> Great, thanks!  Here is a patch.

Looks good to me. I wonder if the HAVE_MANGLED_GL conditional can be
dropped at this point? Anyway,

Reviewed-by: Dan Nicholson <dbn.lists at gmail.com>