Demos (master): check for GBM
Chia-I Wu
olv at kemper.freedesktop.org
Thu Nov 3 08:11:23 UTC 2011
Module: Demos
Branch: master
Commit: 5a1e31e1edff21c4cebeabaa6a8354e9933ee6d4
URL: http://cgit.freedesktop.org/mesa/demos/commit/?id=5a1e31e1edff21c4cebeabaa6a8354e9933ee6d4
Author: Chia-I Wu <olvaffe at gmail.com>
Date: Thu Oct 27 12:59:20 2011 +0800
check for GBM
EGL on KMS needs GBM.
---
configure.ac | 11 +++++++++++
src/egl/opengl/Makefile.am | 2 ++
2 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/configure.ac b/configure.ac
index 71ed0cc..4f6f16f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -206,6 +206,16 @@ if test "x$x11_enabled" != "xno"; then
PKG_CHECK_MODULES(X11, [x11 xext], [x11_enabled=yes], [x11_enabled=no])
fi
+dnl GBM is needed for EGL on KMS
+AC_ARG_ENABLE([gbm],
+ [AS_HELP_STRING([--enable-gbm],
+ [enable support for GBM @<:@default=no@:>@])],
+ [gbm_enabled="$enableval"],
+ [gbm_enabled=auto])
+if test "x$gbm_enabled" != "xno"; then
+ PKG_CHECK_MODULES(GBM, [gbm], [gbm_enabled=yes], [gbm_enabled=no])
+fi
+
dnl FreeType2 is needed by an OpenVG demo
AC_ARG_ENABLE([freetype2],
[AS_HELP_STRING([--enable-freetype2],
@@ -280,6 +290,7 @@ AM_CONDITIONAL(HAVE_GLESV2, test "x$glesv2_enabled" = "xyes")
AM_CONDITIONAL(HAVE_VG, test "x$vg_enabled" = "xyes")
AM_CONDITIONAL(HAVE_GLUT, test "x$glut_enabled" = "xyes")
AM_CONDITIONAL(HAVE_X11, test "x$x11_enabled" = "xyes")
+AM_CONDITIONAL(HAVE_GBM, test "x$gbm_enabled" = "xyes")
AM_CONDITIONAL(HAVE_FREETYPE2, test "x$freetype2_enabled" = "xyes")
AM_CONDITIONAL(HAVE_OSMESA, test "x$osmesa_enabled" = "xyes")
AM_CONDITIONAL(HAVE_DRM, test "x$drm_enabled" = "xyes")
diff --git a/src/egl/opengl/Makefile.am b/src/egl/opengl/Makefile.am
index 2c9956f..6df114d 100644
--- a/src/egl/opengl/Makefile.am
+++ b/src/egl/opengl/Makefile.am
@@ -43,9 +43,11 @@ EGL_X11_DEMOS = \
endif
if HAVE_DRM
+if HAVE_GBM
EGL_DRM_DEMOS = \
eglkms
endif
+endif
if HAVE_EGL
noinst_PROGRAMS = \
More information about the mesa-commit
mailing list