Commit 42968424 authored by Akihiko Odaki's avatar Akihiko Odaki Committed by Emil Velikov

mesa: don't install GLX files if GLX is not built

Cc: "11.2 12.0" <mesa-stable@lists.freedesktop.org>
Signed-off-by: 's avatarAkihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp>
[Emil Velikov: Drop guards around dri_interface.h, add stable tag]
Signed-off-by: 's avatarEmil Velikov <emil.velikov@collabora.com>
parent 7a9d6abc
......@@ -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)
......
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment