From 42968424fb4100f2035badf236b005cc8d62a592 Mon Sep 17 00:00:00 2001 From: Akihiko Odaki Date: Sun, 26 Jun 2016 10:54:35 +0900 Subject: [PATCH] mesa: don't install GLX files if GLX is not built Cc: "11.2 12.0" Signed-off-by: Akihiko Odaki [Emil Velikov: Drop guards around dri_interface.h, add stable tag] Signed-off-by: Emil Velikov --- configure.ac | 1 + src/mesa/Makefile.am | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/configure.ac b/configure.ac index c2525d3bebd..367e9b59c2c 100644 --- a/configure.ac +++ b/configure.ac @@ -1060,6 +1060,7 @@ xno) ;; esac +AM_CONDITIONAL(HAVE_GLX, test "x$enable_glx" != xno) AM_CONDITIONAL(HAVE_DRI_GLX, test "x$enable_glx" = xdri) AM_CONDITIONAL(HAVE_XLIB_GLX, test "x$enable_glx" = xxlib) AM_CONDITIONAL(HAVE_GALLIUM_XLIB_GLX, test "x$enable_glx" = xgallium-xlib) diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am index 6d7a3cc9486..037384ad662 100644 --- a/src/mesa/Makefile.am +++ b/src/mesa/Makefile.am @@ -33,8 +33,10 @@ if HAVE_OSMESA SUBDIRS += drivers/osmesa endif +if HAVE_GLX gldir = $(includedir)/GL gl_HEADERS = $(top_srcdir)/include/GL/*.h +endif include Makefile.sources @@ -159,8 +161,10 @@ libmesa_sse41_la_SOURCES = \ libmesa_sse41_la_CFLAGS = $(AM_CFLAGS) $(SSE41_CFLAGS) +if HAVE_GLX pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gl.pc +endif MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D) YACC_GEN = $(AM_V_GEN)$(YACC) $(YFLAGS) -- 2.30.2