[Mesa-dev] [PATCH] build: Fix GLES linkage without libglapi

[Andreas Boll]

fixes a regression introduced with
fc9ea7c74dc5cb996c3d9fe6663fd6da080e8360

Cc: Brian Paul <brianp at vmware.com>
Cc: Matt Turner <mattst88 at gmail.com>
---

Steps to reproduce the regression:

$ ./autogen.sh --enable-xlib-glx --disable-driglx-direct --disable-dri --enable-debug --enable-gles1 --enable-gles2 --enable-openvg --enable-gallium-egl --enable-xa --enable-xorg
$ make

 src/mapi/es1api/Makefile.am |    6 +++++-
 src/mapi/es2api/Makefile.am |    6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/mapi/es1api/Makefile.am b/src/mapi/es1api/Makefile.am
index c49c86e..c163a39 100644
--- a/src/mapi/es1api/Makefile.am
+++ b/src/mapi/es1api/Makefile.am
@@ -41,9 +41,13 @@ GLES_include_HEADERS = \
 lib_LTLIBRARIES = libGLESv1_CM.la
 
 libGLESv1_CM_la_SOURCES = ../mapi/entry.c glapi_mapi_tmp.h
-libGLESv1_CM_la_LIBADD = $(GLESv1_CM_LIB_DEPS) ../shared-glapi/libglapi.la
+libGLESv1_CM_la_LIBADD = $(GLESv1_CM_LIB_DEPS)
 libGLESv1_CM_la_LDFLAGS = -version-number 1:1 -no-undefined
 
+if HAVE_SHARED_GLAPI
+libGLESv1_CM_la_LIBADD += ../shared-glapi/libglapi.la
+endif
+
 include ../glapi/gen/glapi_gen.mk
 glapi_mapi_tmp.h: ../glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
 	$(call glapi_gen_mapi,$<,es1api)
diff --git a/src/mapi/es2api/Makefile.am b/src/mapi/es2api/Makefile.am
index 5e02e1c..0538f73 100644
--- a/src/mapi/es2api/Makefile.am
+++ b/src/mapi/es2api/Makefile.am
@@ -45,9 +45,13 @@ GLES3_include_HEADERS = \
 lib_LTLIBRARIES = libGLESv2.la
 
 libGLESv2_la_SOURCES = ../mapi/entry.c glapi_mapi_tmp.h
-libGLESv2_la_LIBADD = $(GLESv2_LIB_DEPS) ../shared-glapi/libglapi.la
+libGLESv2_la_LIBADD = $(GLESv2_LIB_DEPS)
 libGLESv2_la_LDFLAGS = -version-number 2 -no-undefined
 
+if HAVE_SHARED_GLAPI
+libGLESv2_la_LIBADD += ../shared-glapi/libglapi.la
+endif
+
 include ../glapi/gen/glapi_gen.mk
 glapi_mapi_tmp.h: ../glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
 	$(call glapi_gen_mapi,$<,es2api)
-- 
1.7.10.4