fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-03 11:30:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source 
Cc: "11.2 12.0" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp>
[Emil Velikov: Drop guards around dri_interface.h, add stable tag]
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>

(cherry picked from commit 42968424fb)
This commit is contained in:
Akihiko Odaki 2016-06-26 10:54:35 +09:00 • committed by Emil Velikov
parent 4a3d510b5b
commit 5193fe9f4f
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
configure.ac
View file

@ -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)

4
src/mesa/Makefile.am
View file

@ -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)