Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl
Modified Files:
configure.in
Log Message:
small configure.in update:
* build the evas engine if evas is found (and not if the software-x11 engine
is found)
* use pkg-config stuff to detect the engines
* if the xrender engine is found, enable ecore-x engine
* small fixes in descriptions
===================================================================
RCS file: /cvs/e/e17/libs/ewl/configure.in,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -3 -r1.114 -r1.115
--- configure.in 17 Oct 2007 02:00:55 -0000 1.114
+++ configure.in 28 Oct 2007 14:24:44 -0000 1.115
@@ -58,6 +58,7 @@
PKG_CHECK_MODULES(EVAS, [evas >= 0.9.9])
CFLAGS=$EVAS_CFLAGS" "$CFLAGS
+AM_CONDITIONAL(EWL_ENABLE_EVAS, test "x$have_evas" = "xyes")
PKG_CHECK_MODULES(EFREET, [
efreet >= 0.0.3
@@ -71,142 +72,196 @@
])
CFLAGS=$ECORE_CFLAGS" "$CFLAGS
+dnl software X11
AC_ARG_ENABLE(software-x11,
- [AC_HELP_STRING([--enable-software-x11],[enable software X11 support])],
- [enable_software_x11=$enableval], [enable_software_x11="auto"])
-have_software_x11=no
+ [
+ AC_HELP_STRING(
+ [--enable-software-x11],
+ [enable software X11 support])
+ ],
+ [enable_software_x11=$enableval],
+ [enable_software_x11="auto"])
+
if test "x$enable_software_x11" != "xno" ; then
- AC_CHECK_HEADER(Evas_Engine_Software_X11.h,
- [AC_CHECK_HEADER(Ecore_X.h,
- [have_software_x11=yes],
- [], [#include <Ecore.h>])],
- [], [#include <Evas.h>])
- if test "x$have_software_x11" = "xyes" ; then
- AC_DEFINE(ENABLE_EWL_SOFTWARE_X11, 1, [Enable X11 Software])
- elif test "x$enable_software_x11" = "xyes" ; then
- AC_MSG_ERROR(software X11 requested but no evas/ecore support
found)
- fi
+ PKG_CHECK_MODULES(EVAS_SOFTWARE_X11,
+ [evas-software-x11 >= 0.9.9],
+ [
+ PKG_CHECK_MODULES(ECORE_X,
+ [ecore-x >= 0.9.9],
+ [have_software_x11="yes"],
+ [have_software_x11="no"])
+ ],
+ [have_software_x11="no"])
+ if test "x$have_software_x11" = "xyes" ; then
+ AC_DEFINE(ENABLE_EWL_SOFTWARE_X11, 1, [Enable X11 Software])
+ elif test "x$enable_software_x11" = "xyes" ; then
+ AC_MSG_ERROR(software X11 requested but no evas/ecore support found)
+ fi
fi
AM_CONDITIONAL(EWL_ENABLE_EVAS_SOFTWARE_X11, test "x$have_software_x11" = xyes)
-AC_ARG_ENABLE(software-sdl,
- [AC_HELP_STRING([--enable-software-sdl],[enable software SDL support])],
- [enable_software_sdl=$enableval], [enable_software_sdl="auto"])
-have_software_sdl=no
-if test "x$enable_software_sdl" != "xno" ; then
- AC_CHECK_HEADER(Evas_Engine_SDL.h,
- [AC_CHECK_HEADER(Ecore_Sdl.h,
- [have_software_sdl=yes],
- [], [#include <Ecore.h>])],
- [], [#include <Evas.h>])
- if test "x$have_software_sdl" = "xyes" ; then
- AC_DEFINE(ENABLE_EWL_SOFTWARE_SDL, 1, [Enable SDL Software])
- elif test "x$enable_software_sdl" = "xyes" ; then
- AC_MSG_ERROR(software SDL requested but no evas/ecore support
found)
- fi
-fi
-AM_CONDITIONAL(EWL_ENABLE_EVAS_SOFTWARE_SDL, test "x$have_software_sdl" = xyes)
-
+dnl software X11 16 bpp
AC_ARG_ENABLE(software-16-x11,
- [AC_HELP_STRING([--enable-software-16-x11],[enable software X11
support])],
- [enable_software_16_x11=$enableval], [enable_software_16_x11="auto"])
-have_software_16_x11=no
+ [
+ AC_HELP_STRING(
+ [--enable-software-16-x11],
+ [enable software 16 bpp X11 support])
+ ],
+ [enable_software_16_x11=$enableval],
+ [enable_software_16_x11="auto"])
+
if test "x$enable_software_16_x11" != "xno" ; then
- AC_CHECK_HEADER(Evas_Engine_Software_16_X11.h,
- [AC_CHECK_HEADER(Ecore_X.h,
- [have_software_16_x11=yes],
- [], [#include <Ecore.h>])],
- [], [#include <Evas.h>])
- if test "x$have_software_16_x11" = "xyes" ; then
- AC_DEFINE(ENABLE_EWL_SOFTWARE_16_X11, 1, [Enable X11 Software])
- elif test "x$enable_software_16_x11" = "xyes" ; then
- AC_MSG_ERROR(software X11 requested but no evas/ecore support
found)
- fi
+ PKG_CHECK_MODULES(EVAS_SOFTWARE_16_X11,
+ [evas-software-16-x11 >= 0.9.9],
+ [
+ PKG_CHECK_MODULES(ECORE_X,
+ [ecore-x >= 0.9.9],
+ [have_software_16_x11="yes"],
+ [have_software_16_x11="no"])
+ ],
+ [have_software_16_x11="no"])
+ if test "x$have_software_16_x11" = "xyes" ; then
+ AC_DEFINE(ENABLE_EWL_SOFTWARE_16_X11, 1, [Enable X11 16 bpp Software])
+ elif test "x$enable_software_16_x11" = "xyes" ; then
+ AC_MSG_ERROR(software 16 bpp X11 requested but no evas/ecore support found)
+ fi
fi
AM_CONDITIONAL(EWL_ENABLE_EVAS_SOFTWARE_16_X11, test "x$have_software_16_x11"
= xyes)
+dnl Render X11
AC_ARG_ENABLE(xrender-x11,
- [AC_HELP_STRING([--enable-xrender-x11],[enable xrender X11 support])],
- [enable_xrender_x11=$enableval], [enable_xrender_x11="auto"])
-have_xrender_x11=no
+ [
+ AC_HELP_STRING(
+ [--enable-xrender-x11],
+ [enable xrender X11 support])
+ ],
+ [enable_xrender_x11=$enableval],
+ [enable_xrender_x11="auto"])
+
if test "x$enable_xrender_x11" != "xno" ; then
- AC_CHECK_HEADER(Evas_Engine_XRender_X11.h,
- [AC_CHECK_HEADER(Ecore_X.h,
- [have_xrender_x11=yes],
- [], [#include <Ecore.h>])],
- [], [#include <Evas.h>])
- if test "x$have_xrender_x11" = "xyes" ; then
- AC_DEFINE(ENABLE_EWL_XRENDER_X11, 1, [Enable X11 Xrender])
- elif test "x$enable_xrender_x11" = "xyes" ; then
- AC_MSG_ERROR(xrender X11 requested but no evas/ecore support
found)
- fi
+ PKG_CHECK_MODULES(EVAS_XRENDER_X11,
+ [evas-xrender-x11 >= 0.9.9],
+ [
+ PKG_CHECK_MODULES(ECORE_X,
+ [ecore-x >= 0.9.9],
+ [have_xrender_x11="yes"],
+ [have_xrender_x11="no"])
+ ],
+ [have_xrender_x11="no"])
+ if test "x$have_xrender_x11" = "xyes" ; then
+ AC_DEFINE(ENABLE_EWL_XRENDER_X11, 1, [Enable X11 Xrender])
+ elif test "x$enable_xrender_x11" = "xyes" ; then
+ AC_MSG_ERROR(xrender X11 requested but no evas/ecore support found)
+ fi
fi
AM_CONDITIONAL(EWL_ENABLE_EVAS_XRENDER_X11, test "x$have_xrender_x11" = xyes)
-
+dnl OpenGL X11
AC_ARG_ENABLE(opengl-x11,
- [AC_HELP_STRING([--enable-opengl-x11],[enable opengl X11 support])],
- [enable_opengl_x11=$enableval], [enable_opengl_x11="auto"])
-have_opengl_x11=no
+ [
+ AC_HELP_STRING(
+ [--enable-opengl-x11],
+ [enable opengl X11 support])
+ ],
+ [enable_opengl_x11=$enableval],
+ [enable_opengl_x11="auto"])
+
if test "x$enable_opengl_x11" != "xno" ; then
- AC_CHECK_HEADERS(Evas_Engine_GL_X11.h,
- [AC_CHECK_HEADER(Ecore_X.h,
- [have_opengl_x11=yes],
- [], [#include <Ecore.h>])],
- [], [#include <Evas.h>])
- if test "x$have_opengl_x11" = "xyes" ; then
- AC_DEFINE(ENABLE_EWL_GL_X11, 1, [Enable OpenGL X11])
- elif test "x$enable_opengl_x11" = "xyes" ; then
- AC_MSG_ERROR(opengl X11 requested but no evas/ecore support
found)
- fi
+ PKG_CHECK_MODULES(EVAS_OPENGL_X11,
+ [evas-opengl-x11 >= 0.9.9],
+ [
+ PKG_CHECK_MODULES(ECORE_X,
+ [ecore-x >= 0.9.9],
+ [have_opengl_x11="yes"],
+ [have_opengl_x11="no"])
+ ],
+ [have_opengl_x11="no"])
+ if test "x$have_opengl_x11" = "xyes" ; then
+ AC_DEFINE(ENABLE_EWL_OPENGL_X11, 1, [Enable X11 Opengl])
+ elif test "x$enable_opengl_x11" = "xyes" ; then
+ AC_MSG_ERROR(opengl X11 requested but no evas/ecore support found)
+ fi
fi
-AM_CONDITIONAL(EWL_ENABLE_EVAS_GL_X11, test "x$have_opengl_x11" = xyes)
+AM_CONDITIONAL(EWL_ENABLE_EVAS_OPENGL_X11, test "x$have_opengl_x11" = xyes)
+
+AM_CONDITIONAL(EWL_ENABLE_X11, test "x$have_software_x11" = "xyes" -o
"x$have_software_16_x11" = "xyes" -o "x$have_xrender_x11" = "xyes" -o
"x$have_opengl_x11" = "xyes")
+
+dnl software SDL
+AC_ARG_ENABLE(software-sdl,
+ [
+ AC_HELP_STRING(
+ [--enable-software-sdl],
+ [enable software SDL support])
+ ],
+ [enable_software_sdl=$enableval],
+ [enable_software_sdl="auto"])
-AC_ARG_ENABLE(fbcon,
- [AC_HELP_STRING([--enable-fbcon],[enable fbcon support])],
- [enable_fbcon=$enableval], [enable_fbcon="auto"])
-have_fbcon=no
-if test "x$enable_fbcon" != "xno" ; then
- AC_CHECK_HEADERS(Evas_Engine_FB.h,
- [AC_CHECK_HEADER(Ecore_Fb.h,
- [have_fbcon=yes],
- [], [#include <Ecore.h>])],
- [], [#include <Evas.h>])
- if test "x$have_fbcon" = "xyes" ; then
- AC_DEFINE(ENABLE_EWL_FB, 1, [Enable FB])
- elif test "x$enable_fbcon" = "xyes" ; then
- AC_MSG_ERROR(fbcon requested but no evas/ecore support found)
- fi
+if test "x$enable_software_sdl" != "xno" ; then
+ PKG_CHECK_MODULES(EVAS_SOFTWARE_SDL,
+ [evas-software-sdl >= 0.9.9],
+ [
+ PKG_CHECK_MODULES(ECORE_SDL,
+ [ecore-sdl >= 0.9.9],
+ [have_software_sdl="yes"],
+ [have_software_sdl="no"])
+ ],
+ [have_software_sdl="no"])
+ if test "x$have_software_sdl" = "xyes" ; then
+ AC_DEFINE(ENABLE_EWL_SOFTWARE_SDL, 1, [Enable SDL Software])
+ elif test "x$enable_software_sdl" = "xyes" ; then
+ AC_MSG_ERROR(software SDL requested but no evas/ecore support found)
+ fi
fi
-AM_CONDITIONAL(EWL_ENABLE_EVAS_FB, test "x$have_fbcon" = xyes)
+AM_CONDITIONAL(EWL_ENABLE_EVAS_SOFTWARE_SDL, test "x$have_software_sdl" = xyes)
-if test "x$have_software_x11" = "xyes"; then
- AM_CONDITIONAL(EWL_ENABLE_X11, true)
-else
- if test "x$have_software_16_x11" = "xyes"; then
- AM_CONDITIONAL(EWL_ENABLE_X11, true)
- else
- if test "x$have_opengl_x11" = "xyes"; then
- AM_CONDITIONAL(EWL_ENABLE_X11, true)
- else
- AM_CONDITIONAL(EWL_ENABLE_X11, false)
- fi
- fi
+dnl Frame Buffer
+AC_ARG_ENABLE(framebuffer,
+ [
+ AC_HELP_STRING(
+ [--enable-framebuffer],
+ [enable framebuffer support])
+ ],
+ [enable_framebuffer=$enableval],
+ [enable_framebuffer="auto"])
+
+if test "x$enable_framebuffer" != "xno" ; then
+ PKG_CHECK_MODULES(EVAS_FRAMEBUFFER,
+ [evas-framebuffer >= 0.9.9],
+ [
+ PKG_CHECK_MODULES(ECORE_FB,
+ [ecore-fb >= 0.9.9],
+ [have_framebuffer="yes"],
+ [have_framebuffer="no"])
+ ],
+ [have_framebuffer="no"])
+ if test "x$have_framebuffer" = "xyes" ; then
+ AC_DEFINE(ENABLE_EWL_FB, 1, [Enable FB])
+ elif test "x$enable_framebuffer" = "xyes" ; then
+ AC_MSG_ERROR(framebuffer requested but no evas/ecore support found)
+ fi
fi
+AM_CONDITIONAL(EWL_ENABLE_EVAS_FB, test "x$have_framebuffer" = xyes)
+dnl Buffer
AC_ARG_ENABLE(buffer,
- [AC_HELP_STRING([--enable-buffer],[enable opengl X11 support])],
- [enable_buffer=$enableval], [enable_buffer="auto"])
-have_buffer=no
+ [
+ AC_HELP_STRING(
+ [--enable-buffer],
+ [enable buffer support])
+ ],
+ [enable_buffer=$enableval],
+ [enable_buffer="auto"])
+
if test "x$enable_buffer" != "xno" ; then
- AC_CHECK_HEADERS(Evas_Engine_Buffer.h,
- [have_buffer=yes],
- [], [#include <Evas.h>])
- if test "x$have_buffer" = "xyes" ; then
- AC_DEFINE(ENABLE_EWL_BUFFER, 1, [Enable Buffer])
- elif test "x$enable_buffer" = "xyes" ; then
- AC_MSG_ERROR(buffer requested but no evas support found)
- fi
+ PKG_CHECK_MODULES(EVAS_BUFFER,
+ [evas-software-buffer >= 0.9.9],
+ [have_buffer="yes"],
+ [have_buffer="no"])
+ if test "x$have_buffer" = "xyes" ; then
+ AC_DEFINE(ENABLE_EWL_BUFFER, 1, [Enable Buffer])
+ elif test "x$enable_buffer" = "xyes" ; then
+ AC_MSG_ERROR(buffer requested but no evas/ecore support found)
+ fi
fi
AM_CONDITIONAL(EWL_ENABLE_EVAS_BUFFER, test "x$have_buffer" = xyes)
@@ -371,7 +426,7 @@
echo " Software 16 X11..........................: $have_software_16_x11"
echo " OpenGL X11...............................: $have_opengl_x11"
echo " XRender X11..............................: $have_xrender_x11"
-echo " Framebuffer..............................: $have_fbcon"
+echo " Framebuffer..............................: $have_framebuffer"
echo " SDL......................................: $have_software_sdl"
echo " Buffer...................................: $have_buffer"
echo
-------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs