xserver: Branch 'master'

[Keith Packard]

 configure.ac             |    1 +
 include/xorg-server.h.in |    3 +++
 2 files changed, 4 insertions(+)

New commits:
diff-tree 7d54399cfdaa7f54e28828267a76b89c4e8e798f (from affda73a1d6e291516880dfbcb74b661374524c6)
Author: Keith Packard <keithp at koto.keithp.com>
Date:   Sun Aug 26 22:11:45 2007 -0700

    Add XSERVER_LIBPCIACCESS to xorg-server.h when using libpciaccess

diff --git a/configure.ac b/configure.ac
index 2d0097e..6d7db2d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1595,6 +1595,7 @@ return 0;}
 	AC_DEFINE_DIR(DEFAULT_LIBRARY_PATH, libdir, [Default library install path])
 	AC_DEFINE_DIR(DEFAULT_LOGPREFIX, LOGPREFIX, [Default log location])
 	AC_DEFINE_UNQUOTED(__VENDORDWEBSUPPORT__, ["$VENDOR_WEB"], [Vendor web address for support])
+	AC_DEFINE(XSERVER_LIBPCIACCESS, 1, [Use libpciaccess for all pci manipulation])
 
 	driverdir="$moduledir/drivers"
 	AC_SUBST([moduledir])
diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in
index 3c2ff47..c117dfa 100644
--- a/include/xorg-server.h.in
+++ b/include/xorg-server.h.in
@@ -251,4 +251,7 @@
 /* Loadable XFree86 server awesomeness */
 #undef XFree86LOADER
 
+/* Use libpciaccess */
+#undef XSERVER_LIBPCIACCESS
+
 #endif /* _XORG_SERVER_H_ */