Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas
Modified Files:
configure.in
Log Message:
simply as PLACEHOLDER for a glitz engine. i plan on making it almost
identical to the xrender engine - but xrender and glitz do not map entirely
1:1 api-wise.
===================================================================
RCS file: /cvs/e/e17/libs/evas/configure.in,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -3 -r1.189 -r1.190
--- configure.in 1 Nov 2006 00:05:06 -0000 1.189
+++ configure.in 11 Nov 2006 06:03:13 -0000 1.190
@@ -137,7 +137,6 @@
#######################################
## Check if we should build the software_x11 engine
have_evas_software_x11="no";
-ENGINE_SOFTWARE_X11_PRG="";
## Automatic check...
AC_CHECK_HEADER(X11/X.h,
[ have_evas_software_x11="yes" ],
@@ -165,7 +164,6 @@
x_dir=${x_dir:-/usr/X11R6}
x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
- ENGINE_SOFTWARE_X11_PRG="evas_software_x11_test
evas_software_x11_perf_test evas_software_x11_perf_load"
],
[
AC_MSG_RESULT(disabling software X11 engine)
@@ -178,8 +176,6 @@
#######################################
## Check if we should build the software_xcb engine
have_evas_software_xcb="no";
-ENGINE_SOFTWARE_XCB_PRG="";
-
## Automatic check...
PKG_CHECK_MODULES(
XCB,
@@ -210,8 +206,7 @@
xcb xcb-shm xcb-image xcb-icccm,
[AC_DEFINE(BUILD_ENGINE_SOFTWARE_XCB, 1, [Software XCB Rendering Backend])
xcb_cflags=$XCB_CFLAGS
- xcb_libs=$XCB_LIBS
- ENGINE_SOFTWARE_XCB_PRG="evas_software_xcb_test
evas_software_xcb_perf_test evas_software_xcb_perf_load"],
+ xcb_libs=$XCB_LIBS],
[AC_MSG_RESULT(disabling software XCB engine)
have_evas_software_xcb="no"])
fi
@@ -220,7 +215,6 @@
#######################################
## Check if we should build the directfb engine
have_evas_directfb="no";
-ENGINE_DIRECTFB_PRG="";
## Automatic check...
PKG_CHECK_MODULES(DIRECTFB, directfb >= 0.9.16,
[ have_evas_directfb="yes" ],
@@ -246,7 +240,6 @@
PKG_CHECK_MODULES(DIRECTFB, directfb >= 0.9.16,
[
AC_DEFINE(BUILD_ENGINE_DIRECTFB, 1, [DirectFB Rendering Backend])
- ENGINE_DIRECTFB_PRG="evas_directfb_test evas_directfb_window"
], [
AC_MSG_RESULT(disabling directfb engine)
have_evas_directfb="no"
@@ -258,7 +251,6 @@
#######################################
## Check if we should build the fb engine
have_evas_fb="no";
-ENGINE_FB_PRG="";
## Automatic check...
AC_CHECK_HEADER(linux/fb.h,
[ have_evas_fb="yes" ],
@@ -283,7 +275,6 @@
[
AM_CONDITIONAL(BUILD_ENGINE_FB, true)
AC_DEFINE(BUILD_ENGINE_FB, 1, [Linux FB Rendering Backend])
- ENGINE_FB_PRG="evas_fb_test"
], [
AM_CONDITIONAL(BUILD_ENGINE_FB, false)
AC_MSG_RESULT(disabling fb engine)
@@ -298,7 +289,6 @@
#######################################
## Check if we should build the buffer engine
have_evas_buffer="no";
-ENGINE_BUFFER_PRG="";
## Automatic check...
have_evas_buffer="yes"
## Manual override
@@ -318,7 +308,6 @@
if test "x$have_evas_buffer" = "xyes"; then
AM_CONDITIONAL(BUILD_ENGINE_BUFFER, true)
AC_DEFINE(BUILD_ENGINE_BUFFER, 1, [Buffer Rendering Backend])
- ENGINE_BUFFER_PRG="evas_buffer_test"
else
AM_CONDITIONAL(BUILD_ENGINE_BUFFER, false)
fi
@@ -326,7 +315,6 @@
#######################################
## Check if we should build the software_qtopia engine
have_evas_qtopia="no";
-ENGINE_SOFTWARE_QTOPIA_PRG="";
## Automatic check...
AC_CHECK_HEADER(qdirectpainter_qws.h,
[ have_evas_qtopia="yes" ],
@@ -363,7 +351,6 @@
qt_cflags="-fno-exceptions -fno-rtti -I"$qt_dir"/include"
qt_libs="-L"$qt_dir"/lib -lqte -lqpe"
qt_moc=$qt_dir"/bin/moc"
- ENGINE_SOFTWARE_QTOPIA_PRG="evas_software_qtopia_test"
], [
AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_QTOPIA, false)
AC_MSG_RESULT(disabling qtopia engine)
@@ -383,7 +370,6 @@
#######################################
## Check if we should build the gl_x11 engine
have_evas_gl_x11="no";
-ENGINE_GL_X11_PRG="";
## Automatic check...
AC_CHECK_HEADER(GL/gl.h,
[
@@ -427,7 +413,6 @@
gl_cflags="-I/usr/include"
gl_libs="-lGL -lGLU -lpthread"
gl_dir=""
- ENGINE_GL_X11_PRG="evas_gl_x11_test"
], [
AM_CONDITIONAL(BUILD_ENGINE_GL_X11, false)
AM_CONDITIONAL(BUILD_ENGINE_GL_COMMON, false)
@@ -460,7 +445,6 @@
#######################################
## Check if we should build the gl_x11 engine
have_evas_cairo_x11="no";
-ENGINE_CAIRO_X11_PRG="";
# Automatic check...
#PKG_CHECK_MODULES(CAIRO, cairo >= 1.0.0,
# [ have_evas_cairo_x11="yes" ],
@@ -490,7 +474,6 @@
x_dir="/usr/X11R6";
x_cflags="-I"$x_dir"/include"
x_libs="-L"$x_dir"/lib -lX11 -lXext"
- ENGINE_CAIRO_X11_PRG="evas_cairo_x11_test"
], [
AM_CONDITIONAL(BUILD_ENGINE_CAIRO_X11, false)
AM_CONDITIONAL(BUILD_ENGINE_CAIRO_COMMON, false)
@@ -505,7 +488,6 @@
#######################################
## Check if we should build the xrender_x11 engine
have_evas_xrender_x11="no";
-ENGINE_XRENDER_X11_PRG="";
## Automatic check...
AC_CHECK_HEADER(X11/X.h,
[ have_evas_xrender_x11="yes" ],
@@ -535,7 +517,6 @@
x_dir=${x_dir:-/usr/X11R6}
x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext
-lXrender"
- ENGINE_XRENDER_X11_PRG="evas_xrender_x11_test"
],
[
AC_MSG_RESULT(disabling xrender X11 engine)
@@ -554,8 +535,6 @@
#######################################
## Check if we should build the xrender_xcb engine
have_evas_xrender_xcb="no";
-ENGINE_XRENDER_XCB_PRG="";
-
## Automatic check...
PKG_CHECK_MODULES(
XCBRENDER,
@@ -586,13 +565,58 @@
xcb xcb-shm xcb-render xcb-image xcb-icccm,
[AC_DEFINE(BUILD_ENGINE_XRENDER_XCB, 1, [Xrender XCB Rendering Backend])
xcbrender_cflags=$XCBRENDER_CFLAGS
- xcbrender_libs=$XCBRENDER_LIBS
- ENGINE_XRENDER_XCB_PRG="evas_xrender_xcb_test"],
+ xcbrender_libs=$XCBRENDER_LIBS],
[AC_MSG_RESULT(disabling xrender XCB engine)
have_evas_xrender_xcb="no"])
fi
AM_CONDITIONAL(BUILD_ENGINE_XRENDER_XCB, test "x$have_evas_xrender_xcb" =
"xyes")
+#######################################
+## Check if we should build the glitz_x11 engine
+have_evas_glitz_x11="no";
+## Automatic check...
+AC_CHECK_HEADER(glitz-glx.h,
+ [ have_evas_glitz_x11="yes" ],
+ [ have_evas_glitz_x11="no" ]
+)
+## Manual override
+AC_MSG_CHECKING(whether glitz x11 backend is to be built)
+AC_ARG_ENABLE(glitz-x11, [ --enable-glitz-x11 enable the Glitz
X11 rendering backend], [
+ if test x"$enableval" = x"yes" ; then
+ AC_MSG_RESULT(yes)
+ have_evas_glitz_x11="yes"
+ else
+ AC_MSG_RESULT(no)
+ have_evas_glitz_x11="no"
+ fi
+ ], [
+ AC_MSG_RESULT($have_evas_glitz_x11)
+ ]
+)
+if test "x$have_evas_glitz_x11" = "xyes"; then
+ AC_PATH_XTRA
+ AC_CHECK_HEADER(X11/X.h,
+ [
+ PKG_CHECK_MODULES(GLITZ, glitz glitz-glx,
+ [
+ x_dir=${x_dir:-/usr/X11R6}
+ x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
+ x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
+ AC_DEFINE(BUILD_ENGINE_GLITZ_X11, 1, [Glitz X11 Rendering Backend])
+ ],
+ [
+ AC_MSG_RESULT(disabling glitz X11 engine)
+ have_evas_glitz_x11="no"
+ ]
+ )
+ ],
+ [
+ AC_MSG_RESULT(disabling glitz X11 engine)
+ have_evas_glitz_x11="no"
+ ]
+ )
+fi
+AM_CONDITIONAL(BUILD_ENGINE_GLITZ_X11, test "x$have_evas_glitz_x11" = "xyes")
#####################################################################
## Image loaders
@@ -1833,17 +1857,6 @@
fi
AC_SUBST(requirements)
-AC_SUBST(ENGINE_SOFTWARE_X11_PRG)
-AC_SUBST(ENGINE_SOFTWARE_XCB_PRG)
-AC_SUBST(ENGINE_DIRECTFB_PRG)
-AC_SUBST(ENGINE_FB_PRG)
-AC_SUBST(ENGINE_BUFFER_PRG)
-AC_SUBST(ENGINE_SOFTWARE_QTOPIA_PRG)
-AC_SUBST(ENGINE_GL_X11_PRG)
-AC_SUBST(ENGINE_CAIRO_X11_PRG)
-AC_SUBST(ENGINE_XRENDER_X11_PRG)
-AC_SUBST(ENGINE_XRENDER_XCB_PRG)
-
AC_SUBST(altivec_cflags)
AC_SUBST(pthread_cflags)
@@ -1885,6 +1898,7 @@
src/modules/engines/cairo_x11/Makefile
src/modules/engines/xrender_x11/Makefile
src/modules/engines/xrender_xcb/Makefile
+src/modules/engines/glitz_x11/Makefile
src/modules/loaders/Makefile
src/modules/loaders/edb/Makefile
src/modules/loaders/eet/Makefile
@@ -1932,6 +1946,7 @@
echo " Cairo X11...............: $have_evas_cairo_x11"
echo " XRender X11.............: $have_evas_xrender_x11"
echo " XRender Xcb.............: $have_evas_xrender_xcb"
+echo " Glitz X11...............: $have_evas_glitz_x11"
# FIXME: opengl engine needs to be fixed and tested lots for all drivers
# FIXME: xrender engine to be written
echo
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
