Enlightenment CVS committal
Author : doursse
Project : e17
Module : apps/expedite
Dir : e17/apps/expedite
Modified Files:
configure.in
Log Message:
add software xcb engine support, minor reorganization of some inclusing /
checks etc...
===================================================================
RCS file: /cvs/e/e17/apps/expedite/configure.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- configure.in 29 Apr 2008 22:02:29 -0000 1.17
+++ configure.in 7 Jul 2008 19:31:46 -0000 1.18
@@ -41,20 +41,31 @@
[ want_evas_simple_x11=$enableval ]
)
-### OpenGL GLEW
-EXPEDITE_CHECK_ENGINE([opengl-glew], [OpenGL Glew], "yes",
[glew_libs="-lglew32 -lgdi32"])
-
-### OpenGL X11
-EXPEDITE_CHECK_ENGINE([opengl-x11], [OpenGL X11], "yes")
-
### Software X11
EXPEDITE_CHECK_ENGINE([software-x11], [Software X11], "yes")
### XRender X11
EXPEDITE_CHECK_ENGINE([xrender-x11], [XRender X11], "yes")
-### Software 16bit X11
-EXPEDITE_CHECK_ENGINE([software-16-x11], [Software 16 bits X11], "yes")
+### OpenGL X11
+EXPEDITE_CHECK_ENGINE([opengl-x11], [OpenGL X11], "yes")
+
+### Software XCB
+EXPEDITE_CHECK_ENGINE([software-xcb], [Software XCB], "yes")
+
+# TODO: Check availability of libs
+### DirectDraw
+EXPEDITE_CHECK_ENGINE([software-ddraw], [Software DirectDraw], "yes",
[ddraw_libs="-lddraw -ldxguid"])
+
+# TODO: Check availability of libs
+### Direct3D
+EXPEDITE_CHECK_ENGINE([direct3d], [Direct3D], "yes", [d3d_libs="-ld3d9
-ld3dx9d"])
+
+### OpenGL GLEW
+EXPEDITE_CHECK_ENGINE([opengl-glew], [OpenGL Glew], "yes",
[glew_libs="-lglew32 -lgdi32"])
+
+### Software SDL
+EXPEDITE_CHECK_ENGINE([software-sdl], [Software SDL], "yes")
### FB
EXPEDITE_CHECK_ENGINE([fb], [Framebuffer], "yes")
@@ -62,25 +73,17 @@
### DIRECTFB
EXPEDITE_CHECK_ENGINE([directfb], [DirectFB], "yes")
-# TODO: Check availability of libs
-### DirectDraw
-EXPEDITE_CHECK_ENGINE([software-ddraw], [Software DirectDraw], "yes",
[ddraw_libs="-lddraw -ldxguid"])
+### Software 16bit X11
+EXPEDITE_CHECK_ENGINE([software-16-x11], [Software 16 bits X11], "yes")
# TODO: Check availability of libs
### 16bit DirectDraw
EXPEDITE_CHECK_ENGINE([software-16-ddraw], [Software 16 bits DirectDraw],
"yes", [ddraw_libs="-lddraw -ldxguid"])
# TODO: Check availability of libs
-### Direct3D
-EXPEDITE_CHECK_ENGINE([direct3d], [Direct3D], "yes", [d3d_libs="-ld3d9
-ld3dx9d"])
-
-# TODO: Check availability of libs
### 16bit WinCE
EXPEDITE_CHECK_ENGINE([software-16-wince], [Software 16 bits WinCE], "yes",
[wince_16_libs="-laygshell"])
-### Software SDL
-EXPEDITE_CHECK_ENGINE([software-sdl], [Software SDL], "yes")
-
if 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"; then
AC_PATH_XTRA
AC_CHECK_HEADERS(X11/Xlib.h X11/Xutil.h,
@@ -96,6 +99,13 @@
fi
AM_CONDITIONAL(BUILD_X11, test "x$have_x11" = "xyes")
+if test "x$have_software_xcb" = "xyes"; then
+ PKG_CHECK_MODULES([XCB], xcb xcb-keysyms,
+ [ have_software_xcb="yes" ],
+ [ have_software_xcb="no" ])
+fi
+AM_CONDITIONAL(BUILD_XCB, test "x$have_xcb" = "xyes")
+
if test "x$have_software_sdl" = "xyes"; then
PKG_CHECK_MODULES([SDL], sdl,
[ have_sdl="yes" ],
@@ -130,17 +140,18 @@
echo
echo " Engines:"
echo " Software X11.................: ${have_software_x11}"
-echo " Software X11 16 bits.........: ${have_software_16_x11}"
echo " X Render X11.................: ${have_xrender_x11}"
echo " Open GL X11..................: ${have_opengl_x11}"
-echo " Open GL Glew.................: ${have_opengl_glew}"
+echo " Software XCB.................: ${have_software_xcb}"
echo " Software DirectDraw..........: ${have_software_ddraw}"
-echo " Software DirectDraw 16 bits..: ${have_software_16_ddraw}"
echo " Direct3D.....................: ${have_direct3d}"
-echo " Software WinCE 16 bits.......: ${have_software_16_wince}"
+echo " Open GL Glew.................: ${have_opengl_glew}"
echo " Software SDL.................: ${have_software_sdl}"
echo " FB...........................: ${have_fb}"
echo " DirectFB.....................: ${have_directfb}"
+echo " Software X11 16 bits.........: ${have_software_16_x11}"
+echo " Software DirectDraw 16 bits..: ${have_software_16_ddraw}"
+echo " Software WinCE 16 bits.......: ${have_software_16_wince}"
echo
echo " Installation:"
echo " prefix.......................: ${prefix}"
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
