diff options
| author | Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp> | 2016-06-26 10:54:35 +0900 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2016-07-07 15:58:11 +0100 |
| commit | 42968424fb4100f2035badf236b005cc8d62a592 (patch) | |
| tree | a7e85373a756ccfeb0a559d6306a2fe74d193ab8 | |
| parent | 7a9d6abcae63a6f837fa161246ecf1f14840e77b (diff) | |
| download | external_mesa3d-42968424fb4100f2035badf236b005cc8d62a592.zip external_mesa3d-42968424fb4100f2035badf236b005cc8d62a592.tar.gz external_mesa3d-42968424fb4100f2035badf236b005cc8d62a592.tar.bz2 | |
mesa: don't install GLX files if GLX is not built
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>
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/mesa/Makefile.am | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index c2525d3..367e9b5 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 6d7a3cc..037384a 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) |