Evas: Fix build issue when building without drm
authorChris Michael <cp.michael@samsung.com>
Fri, 28 Feb 2014 14:44:18 +0000 (14:44 +0000)
committerChris Michael <cp.michael@samsung.com>
Fri, 28 Feb 2014 14:46:44 +0000 (14:46 +0000)
@bugfix: Fix issue of building efl without drm or drm hw accel options

By default drm & drm hw acceleration is off as an option. This caused
a problem when passing no options to autogen due to a missing define.
This commit fixes that mess by only defining HAVE_DRM_HW_ACCEL If we
actually have the deps for it, rather than using an AM_CONDITIONAL as
it did previously.

Signed-off-by: Chris Michael <cp.michael@samsung.com>
m4/evas_check_engine.m4

index d8bee0f..2694d93 100644 (file)
@@ -622,11 +622,6 @@ if test "x${have_dep}" = "xyes" ; then
   fi
   AC_MSG_RESULT([${have_hw_dep}])
 
-  if test "x${have_hw_dep}" = "xyes" ; then
-    AC_DEFINE(HAVE_DRM_HW_ACCEL, 1, [Enabled drm hardware accelerated rendering])
-  fi
-  AM_CONDITIONAL([HAVE_DRM_HW_ACCEL], [test "x${have_hw_dep}" = "xyes"])
-
    if test "x$3" = "xstatic" ; then
       requirements_pc_evas="${requirement} ${requirements_pc_evas}"
       requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
@@ -637,6 +632,12 @@ if test "x${have_dep}" = "xyes" ; then
    fi
 fi
 
+if test "x${have_hw_dep}" = "xyes" ; then
+  AC_DEFINE(HAVE_DRM_HW_ACCEL, [1], 
+   [Enabled drm hardware accelerated rendering])
+fi
+
+
 AC_SUBST([evas_engine_$1_cflags])
 AC_SUBST([evas_engine_$1_libs])