devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=807f9446969b37c7bdebe0aa2fbb0e15bbc16c75
commit 807f9446969b37c7bdebe0aa2fbb0e15bbc16c75 Author: Chris Michael <[email protected]> Date: Fri Feb 28 14:44:18 2014 +0000 Evas: Fix build issue when building without drm @bugfix: Fix issue of building efl without drm or drm hw accel options By default drm & drm hw acceleration is off as an option. This caused a problem when passing no options to autogen due to a missing define. This commit fixes that mess by only defining HAVE_DRM_HW_ACCEL If we actually have the deps for it, rather than using an AM_CONDITIONAL as it did previously. Signed-off-by: Chris Michael <[email protected]> --- m4/evas_check_engine.m4 | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/m4/evas_check_engine.m4 b/m4/evas_check_engine.m4 index d8bee0f..2694d93 100644 --- a/m4/evas_check_engine.m4 +++ b/m4/evas_check_engine.m4 @@ -622,11 +622,6 @@ if test "x${have_dep}" = "xyes" ; then fi AC_MSG_RESULT([${have_hw_dep}]) - if test "x${have_hw_dep}" = "xyes" ; then - AC_DEFINE(HAVE_DRM_HW_ACCEL, 1, [Enabled drm hardware accelerated rendering]) - fi - AM_CONDITIONAL([HAVE_DRM_HW_ACCEL], [test "x${have_hw_dep}" = "xyes"]) - if test "x$3" = "xstatic" ; then requirements_pc_evas="${requirement} ${requirements_pc_evas}" requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}" @@ -637,6 +632,12 @@ 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]) --
