From 453329916ee1bcaf5f9882cb90ed1ec8572a4695 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Fri, 25 Mar 2016 10:53:38 +0900 Subject: [PATCH] efl: fix build when drm and fb are enabled .. and more after elm merge build broke with things like this enabled. this fixes that. i'd like to bring up one issue here. ecore_drm is not a good abstractionlayer. it requires libdrm and other headers from system and it should have abstracted things so the system libdrm is hidden/not needed for build (or even perhaps at runtime and this could be rolled into ecore_drm). this is how ecore_x is... and ecore_fb etc. --- configure.ac | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index a85c174458..3458e972a6 100644 --- a/configure.ac +++ b/configure.ac @@ -5139,9 +5139,6 @@ EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [eo]) EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [efl]) EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [evas]) EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [ecore]) -EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ELEMENTARY], [${build_ecore_evas_x11}], [ecore_x]) -EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ELEMENTARY], [${want_drm}], [ecore_drm]) -EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ELEMENTARY], [${build_ecore_evas_wayland}], [ecore_wl2]) EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [ecore-evas]) EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [ecore-file]) EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [ecore-input]) @@ -5158,6 +5155,21 @@ EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [efreet-mime]) EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [efreet-trash]) EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [elocation]) +EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ELEMENTARY], [${want_x11_any}], [ecore_x]) +EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ELEMENTARY], [${want_fb}], [ecore_fb]) +EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ELEMENTARY], [${have_ps3}], [ecore_psl1ght]) +EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ELEMENTARY], [${want_sdl}], [ecore_sdl]) +EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ELEMENTARY], [${want_ecore_evas_gl_cocoa}], [ecore_cocoa]) +EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ELEMENTARY], [${build_ecore_evas_win32}], [ecore_win32]) +EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ELEMENTARY], [${want_drm}], [ecore_drm]) +EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ELEMENTARY], [${build_ecore_evas_wayland}], [ecore_wl2]) + +dnl Special case deps for ecore_drm +if test "${want_drm}" = "yes"; then + EFL_DEPEND_PKG([ELEMENTARY], [DRM], [libdrm]) + EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [eeze]) +fi + EFL_ADD_LIBS([ELEMENTARY], [-lm]) ELM_CHECK_BACKEND([X], [${want_x11_any}])