[Mesa-stable] [PATCH mesa] configure: only install khrplatform.h if needed

Eric Engestrom eric.engestrom at imgtec.com
Fri Jul 14 10:59:00 UTC 2017


khrplatform.h is only used by EGL and GLES; let's only install it when
one of those is enabled.

Cc: mesa-stable at lists.freedesktop.org
Signed-off-by: Eric Engestrom <eric.engestrom at imgtec.com>
---
 configure.ac         | 3 +++
 src/mapi/Makefile.am | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/configure.ac b/configure.ac
index 61d98e28e0..46fcd8f3fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1291,6 +1291,9 @@ AM_CONDITIONAL(HAVE_OPENGL_ES2, test "x$enable_gles2" = xyes)
 AM_CONDITIONAL(NEED_OPENGL_COMMON, test "x$enable_opengl" = xyes -o \
                                         "x$enable_gles1" = xyes -o \
                                         "x$enable_gles2" = xyes)
+AM_CONDITIONAL(NEED_KHRPLATFORM, test "x$enable_egl" = xyes -o \
+                                      "x$enable_gles1" = xyes -o \
+                                      "x$enable_gles2" = xyes)
 
 # Validate GLX options
 if test "x$enable_glx" = xyes; then
diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am
index 9ff70a14fd..83e32d2185 100644
--- a/src/mapi/Makefile.am
+++ b/src/mapi/Makefile.am
@@ -242,5 +242,7 @@ es2api/glapi_mapi_tmp.h: glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
 
 include $(top_srcdir)/install-lib-links.mk
 
+if NEED_KHRPLATFORM
 khrdir = $(includedir)/KHR
 khr_HEADERS = $(top_srcdir)/include/KHR/khrplatform.h
+endif
-- 
Cheers,
  Eric



More information about the mesa-stable mailing list