From ab900fcc9de2c1e2146cbf56abe95caebeba1caa Mon Sep 17 00:00:00 2001 From: Erwin Rol Date: Wed, 20 Jan 2010 00:15:56 +0100 Subject: [PATCH 1/2] fix X11 detection Use pkgconfig for X11 detection. This diff is simply cherrypicked from upstream and should not be needed anymore for the next release of directfb. Signed-off-by: Erwin Rol --- configure.in | 14 ++------------ 1 files changed, 2 insertions(+), 12 deletions(-) diff --git a/configure.in b/configure.in index 1ca4d6d..6b7e0ba 100644 --- a/configure.in +++ b/configure.in @@ -134,18 +134,8 @@ AC_ARG_ENABLE(x11, enable_x11=yes) if test "$enable_x11" = "yes"; then - CFLAGS_saved="$CFLAGS" - CFLAGS="$CFLAGS -I/usr/X11R6/include" - AC_CHECK_HEADER(X11/X.h, x11_found=yes, x11_found=no) - CFLAGS="$CFLAGS_saved" - if test "$x11_found" = no; then - enable_x11=no - AC_MSG_WARN([ -*** no X11/X.h found -- building without X11 support.]) - else - X11_LIBS="-L/usr/X11R6/lib -lX11 -lXext" - X11_CFLAGS="-I/usr/X11R6/include" - fi + PKG_CHECK_MODULES([X11], [xproto x11 xext], [enable_x11="yes"], [enable_x11="no", + AC_MSG_WARN([*** no X11 found -- building without X11 support])]) fi AM_CONDITIONAL(X11_CORE, test "$enable_x11" = "yes") -- 1.6.6