From 0c716d210d1c60e5e5f78877895618c87c2d39b5 Mon Sep 17 00:00:00 2001 From: Sebastian Dransfeld Date: Mon, 5 Nov 2007 20:03:28 +0000 Subject: [PATCH] If we want to build ecore_fb, built ecore_evas_fb by default. Fix ecore-evas requires AC_HELP_STRING SVN revision: 32381 --- legacy/ecore/configure.in | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/legacy/ecore/configure.in b/legacy/ecore/configure.in index fab057184c..2b280587df 100644 --- a/legacy/ecore/configure.in +++ b/legacy/ecore/configure.in @@ -517,19 +517,20 @@ fi ECORE_CHECK_MODULE([Win32], [no], [$have_win32], [ecore_win32_libs="$ecore_win32_libs $ddraw_libs $ddraw_16_libs $direct3d_libs"]) +if test "x$have_ecore_win32" = "xyes"; then + requirements_ecore_evas="$requirements_ecore_evas ecore-win32" +fi + if test "x${have_ecore_win32}" = "xyes" -a "x${have_ddraw}" = "xyes"; then AC_DEFINE(BUILD_ECORE_EVAS_DIRECTDRAW, 1, [Support for DirectDraw Engine in Ecore_Evas]) - requirements_ecore_evas="$requirements_ecore_evas ecore-software-ddraw" fi if test "x${have_ecore_win32}" = "xyes" -a "x${have_ddraw_16}" = "xyes"; then AC_DEFINE(BUILD_ECORE_EVAS_DIRECTDRAW_16, 1, [Support for 16 bpp DirectDraw Engine in Ecore_Evas]) - requirements_ecore_evas="$requirements_ecore_evas ecore-software-16-ddraw" fi if test "x${have_ecore_win32}" = "xyes" -a "x${have_direct3d}" = "xyes"; then AC_DEFINE(BUILD_ECORE_EVAS_DIRECT3D, 1, [Support for Direct3D Engine in Ecore_Evas]) - requirements_ecore_evas="$requirements_ecore_evas ecore-direct3d" fi dnl ecore_dfb @@ -593,10 +594,10 @@ AC_SUBST(tslib_libs) dnl ecore_evas_fb have_ecore_evas_fb="no"; if test "x$have_ecore_fb" = "xyes"; then - want_ecore_evas_fb="no"; + want_ecore_evas_fb="yes"; AC_MSG_CHECKING(whether ecore_evas fb support is to be built) AC_ARG_ENABLE(ecore-evas-fb, - AC_HELP_STRING([--enable-ecore-evas-fb], [enable fb in the ecore_evas module]), + AC_HELP_STRING([--disable-ecore-evas-fb], [disable fb in the ecore_evas module]), [ want_ecore_evas_fb=$enableval ] ) AC_MSG_RESULT($want_ecore_evas_fb) @@ -713,7 +714,7 @@ if test "x$have_ecore_file" = "xyes"; then want_poll="yes" AC_MSG_CHECKING(whether polling is to be used for filemonitoring) AC_ARG_ENABLE(poll, - [ --disable-poll disable poll in the ecore_file module], + AC_HELP_STRING([--disable-poll], [disable poll in the ecore_file module]), [ want_poll=$enableval ] ) AC_MSG_RESULT($want_poll)