From fef4c7a6f1a1ef34233b36137bb66d9a657307fb Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 7 Aug 2007 09:01:14 -0700 Subject: [PATCH] Fix driver build after pixman changes. --- configure.ac | 2 ++ xorg-server.pc.in | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 10fcbeb09..f1e396e8a 100644 --- a/configure.ac +++ b/configure.ac @@ -618,6 +618,8 @@ XEXT_LIB='$(top_builddir)/Xext/libXext.la' 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 7b4b2fb24..fba3b15a6 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}