aboutsummaryrefslogtreecommitdiffstats
path: root/m4
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2014-07-18 15:29:35 +0200
committerStefan Schmidt <s.schmidt@samsung.com>2014-07-18 15:32:52 +0200
commit6d08b96bd3d41d6089c0456fc5044fce2a0506f9 (patch)
tree58ae008d59db2cf3efaada8cb56d1bf27b21bfe5 /m4
parentevas - render2 - now finally tracking updates right. map/proxy not done (diff)
downloadefl-6d08b96bd3d41d6089c0456fc5044fce2a0506f9.tar.gz
build/drm: Allow building from scratch by not using pkgconfig for internal libs
Using pkgconfig for internal libs turns out to be not a really good idea. It works fine if you already have an efl install with the needed ecore-drm.pc file but it will fail if you build from scratch. We already have a m4 macro for these internal dependencies. Make use of it for the evas drm engine depending on ecore-drm. Fixes https://phab.enlightenment.org/T1432
Diffstat (limited to 'm4')
-rw-r--r--m4/evas_check_engine.m412
1 files changed, 2 insertions, 10 deletions
diff --git a/m4/evas_check_engine.m4 b/m4/evas_check_engine.m4
index cb29b141fd..05ec1f8d7a 100644
--- a/m4/evas_check_engine.m4
+++ b/m4/evas_check_engine.m4
@@ -592,7 +592,7 @@ AC_DEFUN([EVAS_CHECK_ENGINE_DEP_DRM],
[
requirement=""
-have_dep="no"
+have_dep="yes"
have_hw_dep="no"
evas_engine_[]$1[]_cflags=""
evas_engine_[]$1[]_libs=""
@@ -603,20 +603,13 @@ else
gl_library="gl"
fi
-PKG_CHECK_EXISTS([ecore-drm],
- [
- have_dep="yes"
- requirement="ecore-drm"
- ],
- [have_dep="no"])
-
if test "x${have_dep}" = "xyes" ; then
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}],
[
have_hw_dep="yes"
- requirement="ecore-drm egl >= 7.10 ${gl_library}"
+ requirement="egl >= 7.10 ${gl_library}"
],
[have_hw_dep="no"])
fi
@@ -626,7 +619,6 @@ if test "x${have_dep}" = "xyes" ; then
requirements_pc_evas="${requirement} ${requirements_pc_evas}"
requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
else
- PKG_CHECK_MODULES([DRM], [${requirement}])
evas_engine_[]$1[]_cflags="${DRM_CFLAGS}"
evas_engine_[]$1[]_libs="${DRM_LIBS}"
fi