From d01bcdb2d6d5d4b4895823c5af0d9bed5d3bfbfe Mon Sep 17 00:00:00 2001 From: devilhorns Date: Wed, 27 Jul 2011 07:40:55 +0000 Subject: [PATCH] Ecore: Fix configure.ac for dumb systems that cannot find pixman without being explicitly told where it is. git-svn-id: http://svn.enlightenment.org/svn/e/trunk/ecore@61797 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- configure.ac | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index e8eefce..dc31d83 100644 --- a/configure.ac +++ b/configure.ac @@ -784,12 +784,26 @@ if test "x$want_ecore_x_xcb" = "xyes" ; then fi ## x11-xcb - PKG_CHECK_MODULES(XCB, xcb xcb-shm xcb-icccm xcb-image xcb-keysyms pixman-1, + PKG_CHECK_MODULES(XCB, xcb xcb-shm xcb-icccm xcb-image xcb-keysyms, [ have_ecore_x_xcb="yes" - requirements_ecore_x="xcb xcb-shm xcb-icccm xcb-image xcb-keysyms pixman-1 ${requirements_ecore_x}" ], + requirements_ecore_x="xcb xcb-shm xcb-icccm xcb-image xcb-keysyms ${requirements_ecore_x}" ], [ have_ecore_x_xcb="no" ]) if test "x$have_ecore_x_xcb" = "xyes" ; then + + PKG_CHECK_MODULES([PIXMAN], + [pixman-1], + [ + have_pixman="yes" + AC_DEFINE(HAVE_PIXMAN, 1, [have pixman for rendering]) + requirements_ecore_x="pixman-1 ${requirements_ecore_x}" + ], + [ + if test "x${want_pixman}" = "xyes" -a "x${use_strict}" = "xyes" ; then + AC_MSG_ERROR([Pixman not found (strict dependencies checking)]) + fi + ]) + if test "x$want_ecore_x_composite" != "xno"; then PKG_CHECK_MODULES(XCB_COMPOSITE, xcb-composite, [ have_ecore_x_xcb_composite="yes" -- 2.7.4