summaryrefslogtreecommitdiff
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
parentc11592fb6ab724f06216f2e445e06a48befdef24 (diff)
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 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 cb29b14..05ec1f8 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