summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--configure.ac3
-rw-r--r--m4/evas_check_engine.m412
2 files changed, 4 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac
index 44480a0837..c665cfdc79 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3618,7 +3618,8 @@ ECORE_EVAS_MODULE([extn], [${want_ecore_evas_extn}])
3618ECORE_EVAS_MODULE([ews], [yes]) 3618ECORE_EVAS_MODULE([ews], [yes])
3619ECORE_EVAS_MODULE([fb], [${want_fb}]) 3619ECORE_EVAS_MODULE([fb], [${want_fb}])
3620ECORE_EVAS_MODULE([drm], [${want_drm}], 3620ECORE_EVAS_MODULE([drm], [${want_drm}],
3621 [ EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [${want_drm}], [ecore-drm]) ] 3621 [ EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [${want_drm}], [ecore-drm])
3622 EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EVAS], [${want_drm}], [ecore-drm]) ]
3622) 3623)
3623ECORE_EVAS_MODULE([psl1ght], [${have_ps3}]) 3624ECORE_EVAS_MODULE([psl1ght], [${have_ps3}])
3624 3625
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],
592[ 592[
593 593
594requirement="" 594requirement=""
595have_dep="no" 595have_dep="yes"
596have_hw_dep="no" 596have_hw_dep="no"
597evas_engine_[]$1[]_cflags="" 597evas_engine_[]$1[]_cflags=""
598evas_engine_[]$1[]_libs="" 598evas_engine_[]$1[]_libs=""
@@ -603,20 +603,13 @@ else
603 gl_library="gl" 603 gl_library="gl"
604fi 604fi
605 605
606PKG_CHECK_EXISTS([ecore-drm],
607 [
608 have_dep="yes"
609 requirement="ecore-drm"
610 ],
611 [have_dep="no"])
612
613if test "x${have_dep}" = "xyes" ; then 606if test "x${have_dep}" = "xyes" ; then
614 AC_MSG_CHECKING([whether to enable Drm hardware acceleration]) 607 AC_MSG_CHECKING([whether to enable Drm hardware acceleration])
615 if test "x${want_drm_hw_accel}" = "xyes" ; then 608 if test "x${want_drm_hw_accel}" = "xyes" ; then
616 PKG_CHECK_EXISTS([egl >= 7.10 ${gl_library}], 609 PKG_CHECK_EXISTS([egl >= 7.10 ${gl_library}],
617 [ 610 [
618 have_hw_dep="yes" 611 have_hw_dep="yes"
619 requirement="ecore-drm egl >= 7.10 ${gl_library}" 612 requirement="egl >= 7.10 ${gl_library}"
620 ], 613 ],
621 [have_hw_dep="no"]) 614 [have_hw_dep="no"])
622 fi 615 fi
@@ -626,7 +619,6 @@ if test "x${have_dep}" = "xyes" ; then
626 requirements_pc_evas="${requirement} ${requirements_pc_evas}" 619 requirements_pc_evas="${requirement} ${requirements_pc_evas}"
627 requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}" 620 requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
628 else 621 else
629 PKG_CHECK_MODULES([DRM], [${requirement}])
630 evas_engine_[]$1[]_cflags="${DRM_CFLAGS}" 622 evas_engine_[]$1[]_cflags="${DRM_CFLAGS}"
631 evas_engine_[]$1[]_libs="${DRM_LIBS}" 623 evas_engine_[]$1[]_libs="${DRM_LIBS}"
632 fi 624 fi