diff options
| author | Brad King <[email protected]> | 2012-07-16 09:10:02 -0400 |
|---|---|---|
| committer | Dan Nicholson <[email protected]> | 2012-07-23 22:34:13 -0700 |
| commit | 27382c0f7ba2ae826531ba4c254741b2a9df1882 (patch) | |
| tree | 2eef342c2e691777c737390d8cec00fab5832a36 /configure.ac | |
| parent | 82fc813ca870c4002502e098519bead7bec1a7e8 (diff) | |
automake: Honor GL_LIB for mangled/custom lib names
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 use this approach to simplify src/glx/Makefile.am
and drop the HAVE_MANGLED_GL conditional. 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".
Reviewed-by: Dan Nicholson <[email protected]>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index a7f1de36a27..833a9403985 100644 --- a/configure.ac +++ b/configure.ac @@ -389,7 +389,6 @@ fi AC_SUBST([GL_LIB]) AC_SUBST([GLU_LIB]) AC_SUBST([OSMESA_LIB]) -AM_CONDITIONAL(HAVE_MANGLED_GL, test "x${enable_mangling}" = "xyes") dnl dnl potentially-infringing-but-nobody-knows-for-sure stuff |