diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2013-11-29 12:26:43 +0000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-12-05 10:40:11 -0800 |
| commit | 57a8ce927332e855dd29ff30210a211a907adb25 (patch) | |
| tree | 0a9b235b7526cf6932baecf49ccc67eb314455fd | |
| parent | 653d33941b0808ef910aaa5f3aeab05d9c1a100b (diff) | |
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@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@dronecode.org.uk>
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Tested-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 5a36e5440..11a3e1199 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 |