Hi James,
your commit f0018c1e5a94afe7d47ade9b73d0e4926d0c8fba fixed most of the issues
that my last patch was for. Only the detection of the xf86Modes.h is not
working, but that should be fixed by the attached patch.
Kind regards,
Thomas
Am Donnerstag, 1. März 2012, 20:20:34 schrieb Thomas Schlichter:
> 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 2838bdc2eeae18d5a64d51436c8750d7af4982a7 Mon Sep 17 00:00:00 2001
From: Thomas Schlichter <[email protected]>
Date: Thu, 1 Mar 2012 20:57:19 +0100
Subject: [PATCH] Fix check for xf86Modes.h header file
Signed-off-by: Thomas Schlichter <[email protected]>
---
configure.ac | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 1168e64..469d88d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,16 +96,19 @@ 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.
AC_HEADER_STDC
+
+save_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$XORG_CFLAGS $CPPFLAGS"
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"])
+CPPFLAGS="$save_CPPFLAGS"
if test x$XSERVER_LIBPCIACCESS = xyes; then
PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
--
1.7.5.4
_______________________________________________
Openchrome-devel mailing list
[email protected]
http://wiki.openchrome.org/mailman/listinfo/openchrome-devel
