Hi,

This patch fixes a reported problem in a cross-compile scenario. The
$prefix is used in configure.ac to locate the main include directory.
This will never be reliable. The correct value was already supplied by
XORG_CFLAGS through pkg-config xorg-xserver.

There are 3 more video drivers in the same situation:
./xf86-video-dummy/configure.ac
./xf86-video-ark/configure.ac
./xf86-video-apm/configure.ac

I'll create the patches for those as well after this review.
>From 0425ba7285b450862777d834989f9ed9382923fe Mon Sep 17 00:00:00 2001
From: Gaetan Nadon <[email protected]>
Date: Tue, 8 Dec 2009 17:51:00 -0500
Subject: [PATCH] configure.ac: remove -I$(prefix)/include from INCLUDES #24676

Using $prefix for any purpose will yield incorrect results
as not all modules uses the same prefix and that modules can use
different directory which is configurable.

The main include dir comes from XORG_CFLAGS

Signed-off-by: Gaetan Nadon <[email protected]>
---
 configure.ac |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9353694..548810a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,7 +95,7 @@ fi
 AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
 
 CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
-INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
+INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src'
 AC_SUBST([CFLAGS])
 AC_SUBST([INCLUDES])
 
-- 
1.6.0.4

_______________________________________________
xorg-devel mailing list
[email protected]
http://lists.x.org/mailman/listinfo/xorg-devel

Reply via email to