Enlightenment CVS committal Author : englebass Project : e17 Module : libs/ecore
Dir : e17/libs/ecore Modified Files: configure.in Log Message: Check for evas-software-x11 engine. =================================================================== RCS file: /cvs/e/e17/libs/ecore/configure.in,v retrieving revision 1.234 retrieving revision 1.235 diff -u -3 -r1.234 -r1.235 --- configure.in 5 Nov 2007 20:23:39 -0000 1.234 +++ configure.in 5 Nov 2007 20:42:08 -0000 1.235 @@ -354,17 +354,37 @@ ECORE_CHECK_X_EXTENSION([Xrandr], [Xrandr.h], [Xrandr], [XRRSizes]) ECORE_CHECK_X_EXTENSION([Xrender], [Xrender.h], [Xrender], [XRenderFindVisualFormat]) ECORE_CHECK_X_EXTENSION([Xss], [scrnsaver.h], [Xss], [XScreenSaverSelectInput]) - - requirements_ecore_evas="$requirements_ecore_evas ecore-x" fi fi dnl ecore_evas_x11 -# TODO: have_ecore_evas_x11="no" +have_ecore_evas_x11="no" have_ecore_evas_x11_gl="no"; have_ecore_evas_xrender="no"; have_ecore_evas_x11_16="no"; if test "x$have_ecore_x" = "xyes"; then + dnl ecore_evas_x11 + want_ecore_evas_x11=yes + dnl disabling this will make things go haywire + #AC_ARG_ENABLE(ecore-evas-x11, + # AC_HELP_STRING( + # [--enable-ecore-evas-x11], + # [enable X11 support in the ecore_evas module.] + # ), + # [ want_ecore_evas_x11=$enableval ] + #) + AC_MSG_CHECKING(whether ecore_evas x11 support is to be built) + AC_MSG_RESULT($want_ecore_evas_x11) + + if test "x$want_ecore_evas_x11" = "xyes"; then + PKG_CHECK_EXISTS(evas-software-x11, + [ + AC_DEFINE(BUILD_ECORE_EVAS_X11, 1, [Support for X11 Engine in Ecore_Evas]) + have_ecore_evas_x11="yes"; + ] + ) + fi + dnl ecore_evas_x11_gl want_ecore_evas_x11_gl=no AC_ARG_ENABLE(ecore-evas-x11-gl, @@ -429,7 +449,12 @@ ] ) fi - requirements_ecore_evas="$requirements_ecore_evas ecore-x" + if test "x$have_ecore_evas_x11" = "xyes" -o \ + "x$have_ecore_evas_x11_gl" = "yes" -o \ + "x$have_ecore_evas_xrender" = "yes" -o \ + "x$have_ecore_evas_x11_16" = "yes"; then + requirements_ecore_evas="$requirements_ecore_evas ecore-x" + fi fi dnl ecore_win32 @@ -695,6 +720,7 @@ # set up conditionals AM_CONDITIONAL(BUILD_ECORE_X, test $have_ecore_x = yes -a $have_ecore_x_xcb = no) AM_CONDITIONAL(BUILD_ECORE_X_XCB, test $have_ecore_x_xcb = yes) +AM_CONDITIONAL(BUILD_ECORE_EVAS_X11, test $have_ecore_evas_x11 = yes) AM_CONDITIONAL(BUILD_ECORE_EVAS_X11_GL, test $have_ecore_evas_x11_gl = yes) AM_CONDITIONAL(BUILD_ECORE_EVAS_XRENDER, test $have_ecore_evas_xrender = yes) AM_CONDITIONAL(BUILD_ECORE_EVAS_X11_16, test $have_ecore_evas_x11_16 = yes) @@ -757,6 +783,10 @@ else echo " Ecore_X (Xlib backend).......: $have_ecore_x (Xcursor: $use_Xcursor) (Xprint: $use_xprint) (Xinerama: $use_xinerama) (Xrandr: $use_xrandr) (Xscreensaver: $use_xss) (Xrender: $use_xrender) (Xcomposite: $use_xcomposite) (Xfixes: $use_xfixes) (Xdamage: $use_xdamage) (Xdpms: $use_xdpms)" fi +echo " Ecore_Evas X11 Support.......: $have_ecore_evas_x11" +echo " Ecore_Evas X11 GL Support....: $have_ecore_evas_x11_gl" +echo " Ecore_Evas XRender Support...: $have_ecore_evas_xrender" +echo " Ecore_Evas X11 16bpp Support.: $have_ecore_evas_x11_16" echo " Ecore_Win32..................: $have_ecore_win32 (DirectDraw: ${have_ddraw}) (16bpp DirectDraw: ${have_ddraw_16}) (Direct3D: ${have_direct3d})" echo " Ecore_DFB....................: $have_ecore_directfb" @@ -766,10 +796,6 @@ echo " Ecore_SDL....................: $have_ecore_sdl" echo " Ecore_Evas SDL Support.......: $have_ecore_evas_sdl" echo " Ecore_Evas Buffer Support....: $have_ecore_evas_buffer" - -echo " Ecore_Evas X11 GL Support....: $have_ecore_evas_x11_gl" -echo " Ecore_Evas XRender Support...: $have_ecore_evas_xrender" -echo " Ecore_Evas X11 16bpp Support.: $have_ecore_evas_x11_16" echo " Ecore_File...................: $have_ecore_file (Inotify: $have_inotify) (Poll: $have_poll) (CURL: $have_curl)" echo " Ecore_Desktop................: $have_ecore_desktop" ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs