[PATCH video-chips 3/3] config: remove test for the XSERVER_PCIACCESS #define

[Gaetan Nadon]

This symbol is always defined in xorg-xserver.h.
ISA bus is no longer supported, pciaccess is required.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 configure.ac    |   15 +--------------
 src/Makefile.am |    6 +++---
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2dc59d7..aa7532b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,20 +61,7 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
-
-# Checks for libraries.
-SAVE_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
-AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
-              [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
-              [#include "xorg-server.h"])
-CPPFLAGS="$SAVE_CPPFLAGS"
-
-if test "x$XSERVER_LIBPCIACCESS" = xyes; then
-    PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
-    XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
-fi
-AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
+PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
 
 # Checks for header files.
 AC_HEADER_STDC
diff --git a/src/Makefile.am b/src/Makefile.am
index 0ebf7ea..9517c52 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,17 +22,17 @@
 noinst_LTLIBRARIES = libct_accelmm.la libct_accelhi.la
 
 libct_accelmm_la_SOURCES = ct_accel.c
-libct_accelmm_la_CFLAGS = @XORG_CFLAGS@ -DCHIPS_MMIO
+libct_accelmm_la_CFLAGS = $(XORG_CFLAGS) $(PCIACCESS_CFLAGS) -DCHIPS_MMIO
 
 libct_accelhi_la_SOURCES = ct_accel.c
-libct_accelhi_la_CFLAGS = @XORG_CFLAGS@ -DCHIPS_MMIO -DCHIPS_HIQV
+libct_accelhi_la_CFLAGS = $(XORG_CFLAGS) $(PCIACCESS_CFLAGS) -DCHIPS_MMIO -DCHIPS_HIQV
 
 # this is obnoxious:
 # -module lets us name the module exactly how we want
 # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @XORG_CFLAGS@
+AM_CFLAGS = $(XORG_CFLAGS) $(PCIACCESS_CFLAGS)
 chips_drv_la_LTLIBRARIES = chips_drv.la
 chips_drv_la_LDFLAGS = -module -avoid-version
 chips_drv_ladir = @moduledir@/drivers
-- 
1.6.0.4

Revised edition, need  $(PCIACCESS_CFLAGS) for lib targets