<p dir="ltr">Ping?</p>
<div class="gmail_extra"><br><div class="gmail_quote">On Oct 4, 2016 11:05 AM, "Chuck Atkins" <<a href="mailto:chuck.atkins@kitware.com">chuck.atkins@kitware.com</a>> wrote:<br type="attribution"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">This fixes a problem where GL headers would only get installed if<br>
glx was enabled. So if osmesa was enabled but not glx, then the<br>
GL headers required by osmesa would be missing from the install.<br>
<br>
v2: Dropped unneeded mesa_glinterop.h redundant osmesa.h install<br>
<br>
CC: Emil Velikov <<a href="mailto:emil.l.velikov@gmail.com">emil.l.velikov@gmail.com</a>><br>
Signed-off-by: Chuck Atkins <<a href="mailto:chuck.atkins@kitware.com">chuck.atkins@kitware.com</a>><br>
---<br>
<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> | 2 ++<br>
src/Makefile.am | 24 ++++++++++++++++++++++++<br>
src/mesa/Makefile.am | 10 ----------<br>
3 files changed, 26 insertions(+), 10 deletions(-)<br>
<br>
diff --git a/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> b/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
index 1bfac3b..c7be735 100644<br>
--- a/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
+++ b/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
@@ -2641,6 +2641,8 @@ fi<br>
AM_CONDITIONAL(HAVE_LIBDRM, test "x$have_libdrm" = xyes)<br>
AM_CONDITIONAL(HAVE_OSMESA, test "x$enable_osmesa" = xyes)<br>
AM_CONDITIONAL(HAVE_GALLIUM_<wbr>OSMESA, test "x$enable_gallium_osmesa" = xyes)<br>
+AM_CONDITIONAL(HAVE_COMMON_<wbr>OSMESA, test "x$enable_osmesa" = xyes -o \<br>
+ "x$enable_gallium_osmesa" = xyes)<br>
<br>
AM_CONDITIONAL(HAVE_X86_ASM, test "x$asm_arch" = xx86 -o "x$asm_arch" = xx86_64)<br>
AM_CONDITIONAL(HAVE_X86_64_<wbr>ASM, test "x$asm_arch" = xx86_64)<br>
diff --git a/src/Makefile.am b/src/Makefile.am<br>
index 551f431..91d6a7a 100644<br>
--- a/src/Makefile.am<br>
+++ b/src/Makefile.am<br>
@@ -47,6 +47,30 @@ CLEANFILES = $(BUILT_SOURCES)<br>
<br>
SUBDIRS = . gtest util mapi/glapi/gen mapi<br>
<br>
+if HAVE_OPENGL<br>
+gldir = $(includedir)/GL<br>
+gl_HEADERS = \<br>
+ $(top_srcdir)/include/GL/gl.h \<br>
+ $(top_srcdir)/include/GL/<wbr>glext.h \<br>
+ $(top_srcdir)/include/GL/<wbr>glcorearb.h \<br>
+ $(top_srcdir)/include/GL/gl_<wbr>mangle.h<br>
+endif<br>
+<br>
+if HAVE_GLX<br>
+glxdir = $(includedir)/GL<br>
+glx_HEADERS = \<br>
+ $(top_srcdir)/include/GL/glx.h \<br>
+ $(top_srcdir)/include/GL/<wbr>glxext.h \<br>
+ $(top_srcdir)/include/GL/glx_<wbr>mangle.h<br>
+pkgconfigdir = $(libdir)/pkgconfig<br>
+pkgconfig_DATA = mesa/gl.pc<br>
+endif<br>
+<br>
+if HAVE_COMMON_OSMESA<br>
+osmesadir = $(includedir)/GL<br>
+osmesa_HEADERS = $(top_srcdir)/include/GL/<wbr>osmesa.h<br>
+endif<br>
+<br>
# include only conditionally ?<br>
SUBDIRS += compiler<br>
<br>
diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am<br>
index 037384a..9710c7f 100644<br>
--- a/src/mesa/Makefile.am<br>
+++ b/src/mesa/Makefile.am<br>
@@ -33,11 +33,6 @@ if HAVE_OSMESA<br>
SUBDIRS += drivers/osmesa<br>
endif<br>
<br>
-if HAVE_GLX<br>
-gldir = $(includedir)/GL<br>
-gl_HEADERS = $(top_srcdir)/include/GL/*.h<br>
-endif<br>
-<br>
include Makefile.sources<br>
<br>
EXTRA_DIST = \<br>
@@ -161,11 +156,6 @@ libmesa_sse41_la_SOURCES = \<br>
<br>
libmesa_sse41_la_CFLAGS = $(AM_CFLAGS) $(SSE41_CFLAGS)<br>
<br>
-if HAVE_GLX<br>
-pkgconfigdir = $(libdir)/pkgconfig<br>
-pkgconfig_DATA = gl.pc<br>
-endif<br>
-<br>
MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)<br>
YACC_GEN = $(AM_V_GEN)$(YACC) $(YFLAGS)<br>
LEX_GEN = $(AM_V_GEN)$(LEX) $(LFLAGS)<br>
--<br>
2.7.4<br>
<br>
</blockquote></div></div>