xserver: Branch 'master'

[Eric Anholt]

 configure.ac      |    2 ++
 xorg-server.pc.in |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
diff-tree fef4c7a6f1a1ef34233b36137bb66d9a657307fb (from 1339e57485db5a285cfbecbe0bba7154458680ad)
Author: Eric Anholt <eric at anholt.net>
Date:   Tue Aug 7 09:01:14 2007 -0700

    Fix driver build after pixman changes.

diff --git a/configure.ac b/configure.ac
index 10fcbeb..f1e396e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -618,6 +618,8 @@ XEXT_LIB='$(top_builddir)/Xext/libXext.l
 XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la'
 
 PIXMAN="[pixman-1 >= 0.9.4]"
+PKG_CHECK_MODULES(PIXMAN, $PIXMAN)
+AC_SUBST(PIXMAN_CFLAGS)
 
 dnl Core modules for most extensions, et al.
 REQUIRED_MODULES="[randrproto >= 1.2] renderproto [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto [xproto >= 7.0.9] xtrans [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto [inputproto >= 1.4.2] [kbproto >= 1.0.3]"
diff --git a/xorg-server.pc.in b/xorg-server.pc.in
index 7b4b2fb..fba3b15 100644
--- a/xorg-server.pc.in
+++ b/xorg-server.pc.in
@@ -8,5 +8,5 @@ sdkdir=@sdkdir@
 Name: xorg-server
 Description: Modular X.Org X Server
 Version: @PACKAGE_VERSION@
-Cflags: -I${sdkdir}
+Cflags: -I${sdkdir} @PIXMAN_CFLAGS@
 Libs: -L${libdir}