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 
> <[email protected]>
> ---
>  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')

Patch attached.

[1] http://tinderbox.x.org/builds/2013-11-28-0011/logs/xserver/#configure


>From 86d0cd92e6b5919ebba55f9447c5741d8e072043 Mon Sep 17 00:00:00 2001
From: Jon TURNEY <[email protected]>
Date: Fri, 29 Nov 2013 12:22:43 +0000
Subject: [PATCH] Don't fail with an error about requiring libpciaccess with
 --disable-int10-module --disable-pciaccess

Signed-off-by: Jon TURNEY <[email protected]>
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 7a9545b..e37cb59 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1830,7 +1830,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
-- 
1.8.3.4

_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Reply via email to