Hi James, your latest autoconf changes in kms_branch did break the DRI build on Ubuntu Oneiric, at least for me... ;-)
So I'd propose the attached patch that fixes things for me and also does a small cleanup. Kind regards, Thomas
>From 897c722dd3dfc18a77ebec422271a1e52e94e1f0 Mon Sep 17 00:00:00 2001 From: Thomas Schlichter <[email protected]> Date: Wed, 29 Feb 2012 22:00:47 +0100 Subject: [PATCH] Modify CPPFLAGS during header checks to fix DRI autodetection Signed-off-by: Thomas Schlichter <[email protected]> --- configure.ac | 30 ++++++++++++++++++------------ 1 files changed, 18 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index c4e1d73..ce0116d 100644 --- a/configure.ac +++ b/configure.ac @@ -96,16 +96,18 @@ PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), HAVE_XEXTPROTO_71="no") AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ]) -sdkdir=$(pkg-config --variable=sdkdir xorg-server) # Checks for libraries. # Checks for header files. +SAVE_CPPFLAGS="$CPPFLAGS" +CPPFLAGS="$CPPFLAGS $XORG_CFLAGS" + AC_HEADER_STDC AC_CHECK_HEADER(xf86Modes.h,[XMODES=yes],[XMODES=no],[#include "xorg-server.h"]) AC_CHECK_DECL(XSERVER_LIBPCIACCESS, [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no], - [#include "xorg/xorg-server.h"]) + [#include "xorg-server.h"]) if test x$XSERVER_LIBPCIACCESS = xyes; then PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0]) @@ -113,14 +115,22 @@ fi if test "$DRI" != no; then PKG_CHECK_MODULES(DRI, [libdrm >= 2.2 xf86driproto]) - AC_CHECK_HEADER([${sdkdir}/dri.h], - [have_dri_h="yes"], [have_dri_h="no"],[-]) - AC_CHECK_HEADER([${sdkdir}/sarea.h], - [have_sarea_h="yes"], [have_sarea_h="no"],[-]) - AC_CHECK_HEADER([${sdkdir}/dristruct.h], - [have_dristruct_h="yes"], [have_dristruct_h="no"],[-]) + CPPFLAGS="$CPPFLAGS $DRI_CFLAGS" + AC_CHECK_HEADER([dri.h], + [have_dri_h="yes"], [have_dri_h="no"], [#include "xf86str.h"]) + AC_CHECK_HEADER([sarea.h], + [have_sarea_h="yes"], [have_sarea_h="no"]) + AC_CHECK_HEADER([dristruct.h], + [have_dristruct_h="yes"], [have_dristruct_h="no"], [ + #include "xorg-server.h" + #include "xf86str.h" + #include "dri.h" + #include "sarea.h" + ]) fi +CPPFLAGS="$SAVE_CPPFLAGS" + AC_MSG_CHECKING([whether to include DRI support]) if test x$DRI = xauto; then if test "$have_dri_h" = yes -a \ @@ -160,10 +170,6 @@ AC_MSG_RESULT([$XVMC]) AM_CONDITIONAL(XVMC, test x$XVMC = xyes) -# Check the ABI_VIDEODRV_VERSION -SAVE_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS $XORG_CFLAGS" - AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test x$XSERVER_LIBPCIACCESS = xyes) if test "$XSERVER_LIBPCIACCESS" = yes; then AC_DEFINE(XSERVER_LIBPCIACCESS,1,[Enable libpciaccess]) -- 1.7.5.4
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ Openchrome-devel mailing list [email protected] http://wiki.openchrome.org/mailman/listinfo/openchrome-devel
