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

diff --git a/configure.ac b/configure.ac
index 9b5cc63046e43cba2367a046b1df4eff9634b9ca..cf56eb72b27947eacb8e7d1f656315ae0cadf1e1 100644 (file)
--- 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 dd7030e5cf355cacba965e6094d2ec55c837dff9..1db2f47f1e2908b068dddf8064e1634a5ab93efa 100644 (file)
--- 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}],