xserver: Branch 'master'

[Keith Packard]

 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 57a8ce927332e855dd29ff30210a211a907adb25
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date:   Fri Nov 29 12:26:43 2013 +0000

    configure.ac: Fixup for "Require libpciaccess for int10"
    
    On 16/11/2013 01:00, Connor Behan wrote:
    > A --disable-pciaccess build will fail with an int10 module other than
    > stub.
    >
    > Signed-off-by: Connor Behan <connor.behan-Re5JQEeQqe8AvxtiuMwx3w at public.gmane.org>
    > ---
    >  configure.ac | 3 +++
    >  1 file changed, 3 insertions(+)
    >
    > diff --git a/configure.ac b/configure.ac
    > index 5e621e0..a843770 100644
    > --- a/configure.ac
    > +++ b/configure.ac
    > @@ -1822,6 +1822,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])
    >
    
    This causes my build to fail where --disable-int10-module --disable-pciaccess
    is the default (as INT10 still has the default value 'x86emu')
    
    Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
    Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
    Tested-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/configure.ac b/configure.ac
index 5a36e54..11a3e11 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1873,7 +1873,7 @@ 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
+		if test "x$INT10MODULE" = xyes && test "x$INT10" != xstub; then
 			AC_MSG_ERROR([Cannot build int10 without libpciaccess])
 		fi
 	fi