[Mesa-stable] [Mesa-dev] [PATCH mesa] Fix khrplatform.h not installed if EGL is disabled.

[Andres Gomez]

Sound like a good inclusion for -stable (?)

On Mon, 2017-06-12 at 12:00 +0100, Eric Engestrom wrote:
> From: Eric Le Bihan <eric.le.bihan.dev at free.fr>
> 
> KHR/khrplatform.h is required by the EGL, GLES and VG headers, but is
> only installed if Mesa3d is compiled with EGL support.
> 
> This patch installs this header file unconditionally.
> 
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=77240
> Signed-off-by: Eric Le Bihan <eric.le.bihan.dev at free.fr>
> ---
>  src/egl/Makefile.am  | 3 ---
>  src/mapi/Makefile.am | 3 +++
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
> index 14fd77f14a..81090387b5 100644
> --- a/src/egl/Makefile.am
> +++ b/src/egl/Makefile.am
> @@ -163,9 +163,6 @@ pkgconfigdir = $(libdir)/pkgconfig
>  
>  pkgconfig_DATA = main/egl.pc
>  
> -khrdir = $(includedir)/KHR
> -khr_HEADERS = $(top_srcdir)/include/KHR/khrplatform.h
> -
>  egldir = $(includedir)/EGL
>  egl_HEADERS = \
>  	$(top_srcdir)/include/EGL/eglext.h \
> diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am
> index e5477364ce..9ff70a14fd 100644
> --- a/src/mapi/Makefile.am
> +++ b/src/mapi/Makefile.am
> @@ -241,3 +241,6 @@ es2api/glapi_mapi_tmp.h: glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
>  		$(srcdir)/glapi/gen/gl_and_es_API.xml > $@
>  
>  include $(top_srcdir)/install-lib-links.mk
> +
> +khrdir = $(includedir)/KHR
> +khr_HEADERS = $(top_srcdir)/include/KHR/khrplatform.h
-- 
Br,

Andres