From 6d08b96bd3d41d6089c0456fc5044fce2a0506f9 Mon Sep 17 00:00:00 2001
From: Stefan Schmidt <s.schmidt@samsung.com>
Date: Fri, 18 Jul 2014 15:29:35 +0200
Subject: [PATCH] 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
---
 configure.ac            |  3 ++-
 m4/evas_check_engine.m4 | 12 ++----------
 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}])
 ECORE_EVAS_MODULE([ews], [yes])
 ECORE_EVAS_MODULE([fb], [${want_fb}])
 ECORE_EVAS_MODULE([drm], [${want_drm}], 
-  [ EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [${want_drm}], [ecore-drm]) ]
+  [ EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [${want_drm}], [ecore-drm])
+    EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EVAS], [${want_drm}], [ecore-drm]) ]
 )
 ECORE_EVAS_MODULE([psl1ght], [${have_ps3}])
 
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