From 2bef62d6b7aa8305d6387d9b24b487f9cba5e067 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Fri, 14 Jul 2017 11:14:28 +0100 Subject: [PATCH] configure: only install khrplatform.h if needed khrplatform.h is only used by EGL and GLES; let's only install it when one of those is enabled. Cc: mesa-stable@lists.freedesktop.org Signed-off-by: Eric Engestrom Reviewed-by: Jussi Kukkonen Reviewed-by: Emil Velikov (cherry picked from commit 8821ef4be1009328fc0bbf651feda6377efcd6b6) --- configure.ac | 3 +++ src/mapi/Makefile.am | 2 ++ 2 files changed, 5 insertions(+) diff --git a/configure.ac b/configure.ac index f4cc9989f69..fd346c8aa2c 100644 --- a/configure.ac +++ b/configure.ac @@ -1287,6 +1287,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 3133462ccc4..2744b0fd6ba 100644 --- a/src/mapi/Makefile.am +++ b/src/mapi/Makefile.am @@ -246,5 +246,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