Enlightenment CVS committal Author : doursse Project : e17 Module : libs/evas
Dir : e17/libs/evas Modified Files: configure.in Log Message: simplify the detection of xcb =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas/configure.in,v retrieving revision 1.135 retrieving revision 1.136 diff -u -3 -r1.135 -r1.136 --- configure.in 12 Dec 2005 07:49:22 -0000 1.135 +++ configure.in 6 Jan 2006 08:36:57 -0000 1.136 @@ -175,19 +175,13 @@ ## Automatic check... PKG_CHECK_MODULES( XCB, - xcb-image, + xcb xcb-image xcb-icccm, [AC_CHECK_HEADER( X11/X.h, [have_evas_software_xcb="yes"], [have_evas_software_xcb="no"])], [ have_evas_software_xcb="no" ]) -PKG_CHECK_MODULES( - XCB_ICCCM, - xcb-icccm, - [ have_evas_software_xcb="yes" ], - [ have_evas_software_xcb="no" ]) - ## manually disable xcb engine by default - not auto detected. have_evas_software_xcb="no" ## Manual override @@ -208,26 +202,16 @@ AC_PATH_XTRA PKG_CHECK_MODULES( - XCB_ICCCM, - xcb-icccm) - - PKG_CHECK_MODULES( XCB, - xcb-image, - [AC_CHECK_HEADER( - X11/X.h, - [AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_XCB, true) - AC_DEFINE(BUILD_ENGINE_SOFTWARE_XCB, 1, [Software XCB Rendering Backend]) - xcb_dir=${x_dir:-/usr/X11R6} - xcb_cflags="${x_cflags:--I${x_includes:-$x_dir/include}} $XCB_CFLAGS $XCB_ICCCM_CFLAGS" - xcb_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} $XCB_LIBS $XCB_ICCCM_LIBS" - ENGINE_SOFTWARE_XCB_PRG="evas_software_xcb_test evas_software_xcb_perf_test evas_software_xcb_perf_load"], - [AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_XCB, false) - AC_MSG_RESULT(disabling software XCB engine) - have_evas_software_xcb="no"])], + xcb xcb-image xcb-icccm, + [AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_XCB, true) + 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"], [AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_XCB, false) AC_MSG_RESULT(disabling software XCB engine) - have_evas_software_xcb="no" ]) + have_evas_software_xcb="no"]) else AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_XCB, false) fi ------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs