From 7e62952adf259d468bf030f138e7ccf437f47c81 Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Fri, 26 Jun 2009 13:15:32 +0000 Subject: [PATCH] * evas: Fix broken evas_software_16 static module support. SVN revision: 41205 --- legacy/evas/configure.ac | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/legacy/evas/configure.ac b/legacy/evas/configure.ac index 8167071100..e586fed56e 100644 --- a/legacy/evas/configure.ac +++ b/legacy/evas/configure.ac @@ -388,23 +388,6 @@ if test "x${sdl_primitive}" = "xyes" ; then AC_DEFINE([ENGINE_SDL_PRIMITIVE], [1], [Use SDL primitive when possible]) fi -# if software 16 x11 is enabled - build software_16 (the generic 16bit -# engine). later enable it fb_16 or other "16" bit engines are enabled. -have_evas_engine_software_16="no" -if test "x$have_evas_engine_software_16_x11" = "xyes"; then - have_evas_engine_software_16="yes" -fi -if test "x$have_evas_engine_software_sdl" = "xyes"; then - have_evas_engine_software_16="yes" -fi -if test "x$have_evas_engine_software_16_ddraw" = "xyes"; then - have_evas_engine_software_16="yes" -fi -if test "x$have_evas_engine_software_16_wince" = "xyes"; then - have_evas_engine_software_16="yes" -fi -AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_16, test "x$have_evas_engine_software_16" = "xyes") - # if software generic need to be build as part of libevas.so have_static_software_generic="no" AC_ARG_ENABLE([static-software-generic], @@ -419,6 +402,23 @@ if test "x${have_static_software_generic}" = "xyes"; then AC_DEFINE(EVAS_STATIC_BUILD_SOFTWARE_GENERIC, [1], [Build software generic engine as part of libevas]) fi +# if software 16 x11 is enabled - build software_16 (the generic 16bit +# engine). later enable it fb_16 or other "16" bit engines are enabled. +have_evas_engine_software_16="no" +if test "x$have_evas_engine_software_16_x11" = "xyes" -o "x$have_evas_engine_software_16_x11" = "xstatic"; then + have_evas_engine_software_16="yes" +fi +if test "x$have_evas_engine_software_sdl" = "xyes" -o "x$have_evas_engine_software_sdl" = "xstatic"; then + have_evas_engine_software_16="yes" +fi +if test "x$have_evas_engine_software_16_ddraw" = "xyes" -o "x$have_evas_engine_software_16_ddraw" = "xstatic"; then + have_evas_engine_software_16="yes" +fi +if test "x$have_evas_engine_software_16_wince" = "xyes" -o "x$have_evas_engine_software_16_wince" = "xstatic"; then + have_evas_engine_software_16="yes" +fi +AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_16, test "x$have_evas_engine_software_16" = "xyes") + # if software 16 need to be build as part of libevas.so have_static_software_16="no" AC_ARG_ENABLE([static-software-16],