xserver: Branch 'master'

[Ben Byer]

 configure.ac |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
diff-tree 20c6677d1b5f8d77325dd878ffa3df1d0fb01864 (from ff01e44e33fd072958fb0157dae072f1b1c88944)
Author: Ben Byer <bbyer at bbyer.apple.com>
Date:   Wed Sep 5 14:31:01 2007 -0700

    configure.ac: exclude pci-access dependency from XDarwin
    
    XDarwin doesn't need any of this pci stuff since it doesn't talk directly to hardware,
    so it doesn't make sense to require it when building on OSX/Darwin.

diff --git a/configure.ac b/configure.ac
index fab5cf3..cba9d31 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1297,8 +1297,6 @@ if test "x$XORG" = xyes -o "x$XGL" = xye
 dnl Check to see if dlopen is in default libraries (like Solaris, which
 dnl has it in libc), or if libdl is needed to get it.
 
-	PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
-	XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $DLOPEN_LIBS $GLX_SYS_LIBS"
 	XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
 
 	case $host_os in
@@ -1496,6 +1494,12 @@ return 0;}
 		;;
 	esac
 
+        if ! test "$XORG_OS" = "Darwin" ; then
+               PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
+               XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS"
+               XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
+        fi
+
 	if test "x$XORG_OS_PCI" = x ; then
 		XORG_OS_PCI=$XORG_OS
 	fi