From 43c9e896a7c68a2746582939e8f6592230106b24 Mon Sep 17 00:00:00 2001 From: MinJeong Kim Date: Fri, 1 Aug 2014 14:25:52 +0200 Subject: [PATCH] build/drm: Fix missing ecore-drm for evas_drm engine Summary: With removing of pkgconfig checking on EVAS_CHECK_ENGINE for drm, evas_drm engine need to setup libs including internal ecore-drm. But, the evas_drm engine have missed ecore-drm libs because it have been done after finishing setup library of evas. This revision moves setup dependendency for ecore-drm into proper place. Test Plan: 1. Build EFL with --enable-drm 2. ELM_ENGINE=drm E_WL_FORCE=wayland_shm enlightement_start Reviewers: gwanglim, devilhorns, stefan_schmidt Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D1249 --- configure.ac | 3 +-- m4/evas_check_engine.m4 | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 9b5cc63046..cf56eb72b2 100644 --- a/configure.ac +++ b/configure.ac @@ -3617,8 +3617,7 @@ ECORE_EVAS_MODULE([extn], [${want_ecore_evas_extn}]) ECORE_EVAS_MODULE([ews], [yes]) ECORE_EVAS_MODULE([fb], [${want_fb}]) ECORE_EVAS_MODULE([drm], [${want_drm}], - [ EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [${want_drm}], [ecore-drm]) - EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EVAS], [${want_drm}], [ecore-drm]) ] + [EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [${want_drm}], [ecore-drm])] ) ECORE_EVAS_MODULE([psl1ght], [${have_ps3}]) diff --git a/m4/evas_check_engine.m4 b/m4/evas_check_engine.m4 index dd7030e5cf..1db2f47f1e 100644 --- a/m4/evas_check_engine.m4 +++ b/m4/evas_check_engine.m4 @@ -604,6 +604,8 @@ else fi if test "x${have_dep}" = "xyes" ; then + EFL_INTERNAL_DEPEND_PKG([EVAS], [ecore-drm]) + 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}],