devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=64d11ec8063064570c38b61d288db18596cb41d0
commit 64d11ec8063064570c38b61d288db18596cb41d0 Author: Chris Michael <cp.mich...@samsung.com> Date: Wed Apr 22 09:19:07 2015 -0400 efl: Move test for gl library to evas-gl-drm engine checks and Fix T2167 Summary: Since we won't need gl library unless we are building evas-gl-drm engine, move the checks for with_opengl config option to the gl_drm engine checking macro. Also, since gl_drm is ONLY supported if we have --with-opengl=es configure option, let's error out with a message if someone passes anything Other than with_opengl=es. @fix Signed-off-by: Chris Michael <cp.mich...@samsung.com> --- m4/evas_check_engine.m4 | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/m4/evas_check_engine.m4 b/m4/evas_check_engine.m4 index 5dc333f..8165aa2 100644 --- a/m4/evas_check_engine.m4 +++ b/m4/evas_check_engine.m4 @@ -601,24 +601,7 @@ have_hw_dep="no" evas_engine_[]$1[]_cflags="" evas_engine_[]$1[]_libs="" -if test "x${with_opengl}" = "xes" ; then - gl_library="glesv2" -else - gl_library="gl" -fi - if test "x${have_dep}" = "xyes" ; then - AC_MSG_CHECKING([whether to enable Drm hardware acceleration]) - if test "x${want_drm_hw_accel}" = "xyes" ; then - PKG_CHECK_EXISTS([egl >= 7.10 ${gl_library}], - [ - have_hw_dep="yes" - requirement="egl >= 7.10 ${gl_library}" - ], - [have_hw_dep="no"]) - fi - AC_MSG_RESULT([${have_hw_dep}]) - if test "x$3" = "xstatic" ; then requirements_pc_evas="${requirement} ${requirements_pc_evas}" requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}" @@ -628,12 +611,6 @@ if test "x${have_dep}" = "xyes" ; then fi fi -if test "x${have_hw_dep}" = "xyes" ; then - AC_DEFINE(HAVE_DRM_HW_ACCEL, [1], - [Enabled drm hardware accelerated rendering]) -fi - - AC_SUBST([evas_engine_$1_cflags]) AC_SUBST([evas_engine_$1_libs]) @@ -652,7 +629,11 @@ have_hw_dep="no" evas_engine_[]$1[]_cflags="" evas_engine_[]$1[]_libs="" -gl_library="glesv2" +if test "x${with_opengl}" = "xes" ; then + gl_library="glesv2" +else + AC_MSG_ERROR([We currently do not support GL DRM without OpenGL ES. Please consider OpenGL ES if you want to use it.]) +fi PKG_CHECK_EXISTS([egl >= 7.10 ${gl_library} gbm wayland-client >= 1.3.0], [ --