1 From 322af294390a7f4e1524c5a79312be6cbebce988 Mon Sep 17 00:00:00 2001
2 From: Awais Belal <awais_belal@mentor.com>
3 Date: Wed, 11 Nov 2015 17:22:12 +0500
4 Subject: [PATCH] only build GLX demos if needed
6 There are platforms that default to EGL only configurations
7 in which case the GLX applications are not required
8 at all. Allow the user to control generation of these
9 demos as needed through a configure switch.
11 Signed-off-by: Awais Belal <awais_belal@mentor.com>
12 Upstream-Status: Pending
14 configure.ac | 9 +++++++++
15 src/Makefile.am | 6 +++++-
16 2 files changed, 14 insertions(+), 1 deletion(-)
18 diff --git a/configure.ac b/configure.ac
19 index f8ec7e3..1a4d96d 100644
22 @@ -132,6 +132,11 @@ if test "x$enable_glu" = xyes; then
23 DEMO_LIBS="$DEMO_LIBS $GLU_LIBS"
26 +AC_ARG_ENABLE([glx-demos],
27 + [AS_HELP_STRING([--enable-glx-demos],
28 + [enable GLX demos @<:@default=auto@:>@])],
29 + [glx_demos_enabled="$enableval"],
30 + [glx_demos_enabled=yes])
32 [AS_HELP_STRING([--enable-egl],
33 [enable EGL library @<:@default=auto@:>@])],
34 @@ -325,6 +333,7 @@ AC_SUBST([WAYLAND_LIBS])
36 AM_CONDITIONAL(HAVE_GLU, test "x$glu_enabled" = "xyes")
37 AM_CONDITIONAL(HAVE_GLEW, test "x$glew_enabled" = "xyes")
38 +AM_CONDITIONAL(HAVE_GLX, test "x$glx_demos_enabled" = "xyes")
39 AM_CONDITIONAL(HAVE_EGL, test "x$egl_enabled" = "xyes")
40 AM_CONDITIONAL(HAVE_GLESV1, test "x$glesv1_enabled" = "xyes")
41 AM_CONDITIONAL(HAVE_GLESV2, test "x$glesv2_enabled" = "xyes")
42 diff --git a/src/Makefile.am b/src/Makefile.am
43 index 8b89dee..a4d7e8f 100644
46 @@ -44,8 +44,12 @@ SUBDIRS = \