summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2016-03-25 10:53:38 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2016-03-25 10:53:38 +0900
commit453329916ee1bcaf5f9882cb90ed1ec8572a4695 (patch)
treea33f57ff2bf1b9437cd352ce03027f6ef9f60a2e /configure.ac
parentc2c99ca74285305cf3c07631ec18d0734d93939d (diff)
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.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac18
1 files changed, 15 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index a85c174..3458e97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5139,9 +5139,6 @@ EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [eo])
5139EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [efl]) 5139EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [efl])
5140EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [evas]) 5140EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [evas])
5141EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [ecore]) 5141EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [ecore])
5142EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ELEMENTARY], [${build_ecore_evas_x11}], [ecore_x])
5143EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ELEMENTARY], [${want_drm}], [ecore_drm])
5144EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ELEMENTARY], [${build_ecore_evas_wayland}], [ecore_wl2])
5145EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [ecore-evas]) 5142EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [ecore-evas])
5146EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [ecore-file]) 5143EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [ecore-file])
5147EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [ecore-input]) 5144EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [ecore-input])
@@ -5158,6 +5155,21 @@ EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [efreet-mime])
5158EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [efreet-trash]) 5155EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [efreet-trash])
5159EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [elocation]) 5156EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [elocation])
5160 5157
5158EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ELEMENTARY], [${want_x11_any}], [ecore_x])
5159EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ELEMENTARY], [${want_fb}], [ecore_fb])
5160EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ELEMENTARY], [${have_ps3}], [ecore_psl1ght])
5161EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ELEMENTARY], [${want_sdl}], [ecore_sdl])
5162EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ELEMENTARY], [${want_ecore_evas_gl_cocoa}], [ecore_cocoa])
5163EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ELEMENTARY], [${build_ecore_evas_win32}], [ecore_win32])
5164EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ELEMENTARY], [${want_drm}], [ecore_drm])
5165EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ELEMENTARY], [${build_ecore_evas_wayland}], [ecore_wl2])
5166
5167dnl Special case deps for ecore_drm
5168if test "${want_drm}" = "yes"; then
5169 EFL_DEPEND_PKG([ELEMENTARY], [DRM], [libdrm])
5170 EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [eeze])
5171fi
5172
5161EFL_ADD_LIBS([ELEMENTARY], [-lm]) 5173EFL_ADD_LIBS([ELEMENTARY], [-lm])
5162 5174
5163ELM_CHECK_BACKEND([X], [${want_x11_any}]) 5175ELM_CHECK_BACKEND([X], [${want_x11_any}])