Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/evas

Dir     : e17/libs/evas


Modified Files:
        configure.in 


Log Message:


and here are the stubs of a cairo engine

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/configure.in,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -3 -r1.83 -r1.84
--- configure.in        20 May 2004 07:38:43 -0000      1.83
+++ configure.in        17 Aug 2004 06:03:38 -0000      1.84
@@ -402,6 +402,53 @@
   AM_CONDITIONAL(BUILD_ENGINE_GL_COMMON, false)
 fi
 
+
+
+#######################################
+## 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 >= 0.1.23,
+  [ have_evas_cairo_x11="yes" ],
+  [ have_evas_cairo_x11="no" ]
+)
+## Manual override
+AC_MSG_CHECKING(whether cairo x11 backend is to be built)
+AC_ARG_ENABLE(gl-x11, [  --enable-cairo-x11              enable the Cairo X11 display 
engine], [
+          if [ test "$enableval" = "yes" ]; then
+            AC_MSG_RESULT(yes)
+            have_evas_cairo_x11="yes"
+          else
+            AC_MSG_RESULT(no)
+            have_evas_cairo_x11="no"
+          fi
+        ], [
+          AC_MSG_RESULT($have_evas_cairo_x11)
+       ]
+)
+if test "x$have_evas_cairo_x11" = "xyes"; then
+  AC_CHECK_HEADER(X11/X.h,
+    [
+      AM_CONDITIONAL(BUILD_ENGINE_CAIRO_X11, true)
+      AC_DEFINE(BUILD_ENGINE_CAIRO_X11, 1, [Cairo X11 Rendering Backend])
+      AM_CONDITIONAL(BUILD_ENGINE_CAIRO_COMMON, true)
+      AC_DEFINE(BUILD_ENGINE_CAIRO_COMMON, 1, [Generic Cairo Rendering Support])
+      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)
+      AC_MSG_RESULT(disabling Cairo X11 engine)
+    ]
+  )
+else
+  AM_CONDITIONAL(BUILD_ENGINE_CAIRO_X11, false)
+  AM_CONDITIONAL(BUILD_ENGINE_CAIRO_COMMON, false)
+fi
+
 #####################################################################
 ## Image loaders
 
@@ -1441,6 +1488,7 @@
 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(altivec_cflags)
 
@@ -1468,6 +1516,8 @@
 src/lib/engines/directfb/Makefile
 src/lib/engines/gl_common/Makefile
 src/lib/engines/gl_x11/Makefile
+src/lib/engines/cairo_common/Makefile
+src/lib/engines/cairo_x11/Makefile
 src/lib/include/Makefile
 proj/Makefile
 proj/win32_gdi/Makefile
@@ -1498,6 +1548,7 @@
 echo "  Software Memory Buffer..: $have_evas_buffer"
 echo "  DirectFB................: $have_evas_directfb"
 echo "  OpenGL X11..............: $have_evas_gl_x11"
+echo "  Cairo  X11..............: $have_evas_cairo_x11"
 # FIXME: opengl engine needs to be fixed and tested lots for all drivers
 # FIXME: xrender engine to be written
 echo




-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to