From 3d3bf493a3973f4067433d27a4d7ddfecaa18f1c Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sun, 26 Aug 2007 22:27:34 -0700 Subject: Intel driver configuration (only) changes for X server libpciaccess usage. Detect whether the target X server uses libpciaccess, using it in the driver compilation as necessary. This change means that utilities that used to use libpciaccess will not do so unless the driver itself uses libpciaccess. Yes, that could be fixed, but it doesn't seem that important. This patch does not include any code changes necessary to actually have the driver build against an X server using libpciaccess. --- src/Makefile.am | 2 +- src/bios_reader/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 50e913ee..13cbf913 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,7 +18,7 @@ # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -if HAVE_PCIACCESS +if XSERVER_LIBPCIACCESS REGDUMPER = reg_dumper endif diff --git a/src/bios_reader/Makefile.am b/src/bios_reader/Makefile.am index 8e036939..a4adecb1 100644 --- a/src/bios_reader/Makefile.am +++ b/src/bios_reader/Makefile.am @@ -2,7 +2,7 @@ AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @XMODES_CFLAGS@ noinst_PROGRAMS = bios_reader $(BIOS_DUMPER) -if HAVE_PCIACCESS +if XSERVER_LIBPCIACCESS BIOS_DUMPER = bios_dumper bios_dumper_SOURCES = bios_dumper.c -- cgit v1.2.3