1*4882a593SmuzhiyunFrom bb0ffae7164d296d32da24fa5499534de259169a Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Spenser Gilliland <spenser@gillilanding.com> 3*4882a593SmuzhiyunDate: Sat, 24 Feb 2018 11:36:17 +0100 4*4882a593SmuzhiyunSubject: [PATCH] demos: makes opengl an optional component 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunSigned-off-by: Spenser Gilliland <spenser@gillilanding.com> 7*4882a593Smuzhiyun[Romain: convert to git patch, rebase on 8.4.0] 8*4882a593SmuzhiyunSigned-off-by: Romain Naour <romain.naour@gmail.com> 9*4882a593Smuzhiyun--- 10*4882a593Smuzhiyun configure.ac | 12 +++++++++++- 11*4882a593Smuzhiyun src/egl/opengl/Makefile.am | 2 ++ 12*4882a593Smuzhiyun src/util/Makefile.am | 2 ++ 13*4882a593Smuzhiyun 3 files changed, 15 insertions(+), 1 deletion(-) 14*4882a593Smuzhiyun 15*4882a593Smuzhiyundiff --git a/configure.ac b/configure.ac 16*4882a593Smuzhiyunindex 0b5e9a76..24298c44 100644 17*4882a593Smuzhiyun--- a/configure.ac 18*4882a593Smuzhiyun+++ b/configure.ac 19*4882a593Smuzhiyun@@ -51,6 +51,14 @@ m4_ifndef([PKG_PROG_PKG_CONFIG], 20*4882a593Smuzhiyun ACLOCAL="aclocal -I/other/macro/dir" before running autoreconf.])]) 21*4882a593Smuzhiyun PKG_PROG_PKG_CONFIG() 22*4882a593Smuzhiyun 23*4882a593Smuzhiyun+AC_ARG_ENABLE([gl], 24*4882a593Smuzhiyun+ [AS_HELP_STRING([--enable-gl], 25*4882a593Smuzhiyun+ [enable GL library @<:@default=no@:>@])], 26*4882a593Smuzhiyun+ [gl_enabled="$enableval"], 27*4882a593Smuzhiyun+ [gl_enabled=auto]) 28*4882a593Smuzhiyun+ 29*4882a593Smuzhiyun+if test "x$gl_enabled" != "xno"; then 30*4882a593Smuzhiyun+ 31*4882a593Smuzhiyun dnl Get the pkg-config definitions for libGL. We include a fallback 32*4882a593Smuzhiyun dnl path for GL implementation that don't provide a .pc file 33*4882a593Smuzhiyun PKG_CHECK_MODULES(GL, [gl], [], [ 34*4882a593Smuzhiyun@@ -112,6 +120,8 @@ PKG_CHECK_MODULES(GLU, [glu], [], 35*4882a593Smuzhiyun DEMO_CFLAGS="$DEMO_CFLAGS $GLU_CFLAGS" 36*4882a593Smuzhiyun DEMO_LIBS="$DEMO_LIBS $GLU_LIBS" 37*4882a593Smuzhiyun 38*4882a593Smuzhiyun+fi 39*4882a593Smuzhiyun+ 40*4882a593Smuzhiyun AC_ARG_ENABLE([egl], 41*4882a593Smuzhiyun [AS_HELP_STRING([--enable-egl], 42*4882a593Smuzhiyun [enable EGL library @<:@default=auto@:>@])], 43*4882a593Smuzhiyun@@ -302,7 +312,7 @@ AC_SUBST([MESA_GLAPI]) 44*4882a593Smuzhiyun AC_SUBST([WAYLAND_CFLAGS]) 45*4882a593Smuzhiyun AC_SUBST([WAYLAND_LIBS]) 46*4882a593Smuzhiyun 47*4882a593Smuzhiyun- 48*4882a593Smuzhiyun+AM_CONDITIONAL(HAVE_GL, test "x$gl_enabled" = "xyes") 49*4882a593Smuzhiyun AM_CONDITIONAL(HAVE_EGL, test "x$egl_enabled" = "xyes") 50*4882a593Smuzhiyun AM_CONDITIONAL(HAVE_GLESV1, test "x$glesv1_enabled" = "xyes") 51*4882a593Smuzhiyun AM_CONDITIONAL(HAVE_GLESV2, test "x$glesv2_enabled" = "xyes") 52*4882a593Smuzhiyundiff --git a/src/egl/opengl/Makefile.am b/src/egl/opengl/Makefile.am 53*4882a593Smuzhiyunindex 6d184ff6..219ab850 100644 54*4882a593Smuzhiyun--- a/src/egl/opengl/Makefile.am 55*4882a593Smuzhiyun+++ b/src/egl/opengl/Makefile.am 56*4882a593Smuzhiyun@@ -56,6 +56,7 @@ endif 57*4882a593Smuzhiyun endif 58*4882a593Smuzhiyun 59*4882a593Smuzhiyun if HAVE_EGL 60*4882a593Smuzhiyun+if HAVE_GL 61*4882a593Smuzhiyun bin_PROGRAMS = \ 62*4882a593Smuzhiyun eglinfo 63*4882a593Smuzhiyun noinst_PROGRAMS = \ 64*4882a593Smuzhiyun@@ -64,6 +65,7 @@ noinst_PROGRAMS = \ 65*4882a593Smuzhiyun $(EGL_X11_DEMOS) \ 66*4882a593Smuzhiyun $(EGL_WL_DEMOS) 67*4882a593Smuzhiyun endif 68*4882a593Smuzhiyun+endif 69*4882a593Smuzhiyun 70*4882a593Smuzhiyun egltri_x11_SOURCES = egltri.c 71*4882a593Smuzhiyun eglgears_x11_SOURCES = eglgears.c 72*4882a593Smuzhiyundiff --git a/src/util/Makefile.am b/src/util/Makefile.am 73*4882a593Smuzhiyunindex 759a293a..012b9c75 100644 74*4882a593Smuzhiyun--- a/src/util/Makefile.am 75*4882a593Smuzhiyun+++ b/src/util/Makefile.am 76*4882a593Smuzhiyun@@ -27,7 +27,9 @@ AM_CFLAGS = \ 77*4882a593Smuzhiyun AM_LDFLAGS = \ 78*4882a593Smuzhiyun $(DEMO_LIBS) 79*4882a593Smuzhiyun 80*4882a593Smuzhiyun+if HAVE_GL 81*4882a593Smuzhiyun noinst_LTLIBRARIES = libutil.la 82*4882a593Smuzhiyun+endif 83*4882a593Smuzhiyun 84*4882a593Smuzhiyun if HAVE_GLUT 85*4882a593Smuzhiyun AM_CFLAGS += \ 86*4882a593Smuzhiyun-- 87*4882a593Smuzhiyun2.14.3 88*4882a593Smuzhiyun 89