[Mesa-dev] [PATCH] configure.ac: Add --with-(gl|glu|osmesa)-lib-name options

[Brad King]

On 07/09/2012 04:57 PM, Brad King wrote:
> Running "git bisect" points to commit 2d4b77c7 (automake:
> Convert src/mesa/drivers/x11/Makefile, 2012-06-12).  The change
> made by the commit does not obviously drop use of GL_LIB.

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?

Thanks,
-Brad


diff --git a/src/mesa/drivers/x11/Makefile.am b/src/mesa/drivers/x11/Makefile.am
index cced238..af3fa8f 100644
--- a/src/mesa/drivers/x11/Makefile.am
+++ b/src/mesa/drivers/x11/Makefile.am
@@ -33,10 +33,10 @@ AM_CPPFLAGS = \
        $(DEFINES)

 if HAVE_X11_DRIVER
-lib_LTLIBRARIES = libGL.la
+lib_LTLIBRARIES = lib$(GL_LIB).la
 endif

-libGL_la_SOURCES = \
+lib$(GL_LIB)_la_SOURCES = \
        glxapi.h \
        glxheader.h \
        xfonts.h \
@@ -55,20 +55,20 @@ GL_MAJOR = 1
 GL_MINOR = 6
 GL_PATCH = 0

-libGL_la_LIBADD = \
+lib$(GL_LIB)_la_LIBADD = \
        $(top_builddir)/src/mesa/libmesa.a \
        $(top_builddir)/src/mapi/glapi/libglapi.a
-libGL_la_LDFLAGS = \
+lib$(GL_LIB)_la_LDFLAGS = \
        -version-number $(GL_MAJOR):$(GL_MINOR):$(GL_PATCH) \
        $(GL_LIB_DEPS)

 if HAVE_SHARED_GLAPI
-libGL_la_LDFLAGS += -L$(top_builddir)/$(LIB_DIR) -l$(GLAPI_LIB)
+lib$(GL_LIB)_la_LDFLAGS += -L$(top_builddir)/$(LIB_DIR) -l$(GLAPI_LIB)
 endif

 # Provide compatibility with scripts for the old Mesa build system for
 # a while by putting a link to the driver into /lib of the build tree.
-all-local: libGL.la
+all-local: lib$(GL_LIB).la
        $(MKDIR_P) $(top_builddir)/$(LIB_DIR);
-       ln -f .libs/libGL.so.$(GL_MAJOR).$(GL_MINOR).$(GL_PATCH) $(top_builddir)/$(LIB_DIR)/libGL.so.1
-       ln -sf libGL.so.1 $(top_builddir)/$(LIB_DIR)/libGL.so
+       ln -f .libs/lib$(GL_LIB).so.$(GL_MAJOR).$(GL_MINOR).$(GL_PATCH) $(top_builddir)/$(LIB_DIR)/lib$(GL_LIB).so.1
+       ln -sf lib$(GL_LIB).so.1 $(top_builddir)/$(LIB_DIR)/lib$(GL_LIB).so