Enlightenment CVS committal

Author  : doursse
Project : e17
Module  : libs/evas

Dir     : e17/libs/evas


Modified Files:
        Makefile.am configure.in 


Log Message:
fix a leak in xcb eng sfw (it remains one, but I don't see where it comes 
from). Update the xrender one. Don't use them yet (but who uses them ??), 
because it relies on fix of xcb that are in my hd

===================================================================
RCS file: /cvs/e/e17/libs/evas/Makefile.am,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- Makefile.am 19 Apr 2006 09:39:55 -0000      1.31
+++ Makefile.am 23 Apr 2006 15:38:23 -0000      1.32
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I m4
+
 SUBDIRS = data src proj
 
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
===================================================================
RCS file: /cvs/e/e17/libs/evas/configure.in,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -3 -r1.155 -r1.156
--- configure.in        20 Apr 2006 02:30:11 -0000      1.155
+++ configure.in        23 Apr 2006 15:38:23 -0000      1.156
@@ -5,6 +5,7 @@
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_ISC_POSIX
+AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE(evas, 0.9.9.026)
 AM_CONFIG_HEADER(config.h)
 
@@ -223,7 +224,7 @@
 ## Automatic check...
 PKG_CHECK_MODULES(
   XCB,
-  xcb xcb-image xcb-icccm,
+  xcb xcb-shm xcb-image xcb-icccm,
   [AC_CHECK_HEADER(
       X11/X.h,
       [have_evas_software_xcb="yes"],
@@ -251,7 +252,7 @@
 
   PKG_CHECK_MODULES(
     XCB,
-    xcb xcb-image xcb-icccm,
+    xcb xcb-shm xcb-aux xcb-image xcb-icccm,
     [AC_DEFINE(BUILD_ENGINE_SOFTWARE_XCB, 1, [Software XCB Rendering Backend])
      xcb_cflags=$XCB_CFLAGS
      xcb_libs=$XCB_LIBS
@@ -602,8 +603,8 @@
 
 ## Automatic check...
 PKG_CHECK_MODULES(
-  XCB,
-  xcb xcb-image xcb-icccm,
+  XCBRENDER,
+  xcb xcb-shm xcb-render xcb-image xcb-icccm,
   [AC_CHECK_HEADER(
       X11/X.h,
       [have_evas_xrender_xcb="yes"],
@@ -630,11 +631,11 @@
   AC_PATH_XTRA
 
   PKG_CHECK_MODULES(
-    XCB,
-    xcb xcb-image xcb-icccm,
+    XCBRENDER,
+    xcb xcb-shm xcb-render xcb-image xcb-icccm,
     [AC_DEFINE(BUILD_ENGINE_XRENDER_XCB, 1, [Xrender XCB Rendering Backend])
-     xcb_cflags=$XCB_CFLAGS
-     xcb_libs=$XCB_LIBS
+     xcbrender_cflags=$XCBRENDER_CFLAGS
+     xcbrender_libs=$XCBRENDER_LIBS
      ENGINE_XRENDER_XCB_PRG="evas_xrender_xcb_test"],
     [AC_MSG_RESULT(disabling xrender XCB engine)
      have_evas_xrender_xcb="no"])
@@ -1725,6 +1726,8 @@
 
 AC_SUBST(xcb_cflags)
 AC_SUBST(xcb_libs)
+AC_SUBST(xcbrender_cflags)
+AC_SUBST(xcbrender_libs)
 
 AC_SUBST(gl_cflags)
 AC_SUBST(gl_libs)




-------------------------------------------------------
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

Reply via email to