xserver: Branch 'master' - 3 commits

[Keith Packard]

 configure.ac |   42 ++++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 18 deletions(-)

New commits:
commit bd70def07754357d26b86c287037eb3884631daf
Author: Connor Behan <connor.behan at gmail.com>
Date:   Fri Nov 15 17:00:40 2013 -0800

    configure.ac: Require libpciaccess for int10
    
    A --disable-pciaccess build will fail with an int10 module other than
    stub.
    
    Signed-off-by: Connor Behan <connor.behan at gmail.com>
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/configure.ac b/configure.ac
index c7ec947..6197e9b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1830,6 +1830,9 @@ if test "x$XORG" = xyes; then
 		if test "x$CONFIG_UDEV_KMS" = xyes; then
 			AC_MSG_ERROR([Platform device enumeration requires libpciaccess])
 		fi
+		if test "x$INT10" != xstub; then
+			AC_MSG_ERROR([Cannot build int10 without libpciaccess])
+		fi
 	fi
 	AC_MSG_RESULT([$PCI])
 
commit a575c1dc64c10bc88bd0e963ebb8ab137f59a078
Author: Connor Behan <connor.behan at gmail.com>
Date:   Fri Nov 15 17:00:20 2013 -0800

    configure.ac: Require libpciaccess for platform bus support
    
    There is currently no reason to build with --enable-config-udev-kms and
    --disable-pciaccess but anyone who tries this should know that the build
    will fail.
    
    Signed-off-by: Connor Behan <connor.behan at gmail.com>
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/configure.ac b/configure.ac
index b8c85d5..c7ec947 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1826,6 +1826,10 @@ if test "x$XORG" = xyes; then
 			xorg_bus_sparc="yes"
 			;;
 		esac
+	else
+		if test "x$CONFIG_UDEV_KMS" = xyes; then
+			AC_MSG_ERROR([Platform device enumeration requires libpciaccess])
+		fi
 	fi
 	AC_MSG_RESULT([$PCI])
 
commit 361dfe74eaa2f1eddb54abdecca1d8b1b3f58704
Author: Connor Behan <connor.behan at gmail.com>
Date:   Fri Nov 15 17:00:00 2013 -0800

    configure.ac: Add whitespace near PCI configuration
    
    Signed-off-by: Connor Behan <connor.behan at gmail.com>
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/configure.ac b/configure.ac
index 6c4a609..b8c85d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1809,24 +1809,23 @@ if test "x$XORG" = xyes; then
 
 	AC_MSG_CHECKING([whether to build Xorg PCI functions])
 	if test "x$PCI" = xyes; then
-
-	PKG_CHECK_MODULES([PCIACCESS], $LIBPCIACCESS)
-	SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $LIBPCIACCESS"
-	XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $GLX_SYS_LIBS $LIBDRM_LIBS"
-	XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS $LIBDRM_CFLAGS"
-
-	AC_DEFINE(XSERVER_LIBPCIACCESS, 1, [Use libpciaccess for all pci manipulation])
-	AC_DEFINE_DIR(PCI_TXT_IDS_PATH, PCI_TXT_IDS_DIR, [Default PCI text file ID path])
-	case $host_os in
-	  gnu* | freebsd* | kfreebsd*-gnu | netbsd* | openbsd* | solaris* | dragonfly*)
-		xorg_bus_bsdpci="yes"
-		;;
-	esac
-	case $host_cpu in
-	  sparc*)
-		xorg_bus_sparc="yes"
-		;;
-	esac
+		PKG_CHECK_MODULES([PCIACCESS], $LIBPCIACCESS)
+		SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $LIBPCIACCESS"
+		XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $GLX_SYS_LIBS $LIBDRM_LIBS"
+		XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS $LIBDRM_CFLAGS"
+
+		AC_DEFINE(XSERVER_LIBPCIACCESS, 1, [Use libpciaccess for all pci manipulation])
+		AC_DEFINE_DIR(PCI_TXT_IDS_PATH, PCI_TXT_IDS_DIR, [Default PCI text file ID path])
+		case $host_os in
+		  gnu* | freebsd* | kfreebsd*-gnu | netbsd* | openbsd* | solaris* | dragonfly*)
+			xorg_bus_bsdpci="yes"
+			;;
+		esac
+		case $host_cpu in
+		  sparc*)
+			xorg_bus_sparc="yes"
+			;;
+		esac
 	fi
 	AC_MSG_RESULT([$PCI])