diff options
author | Christophe Fergeau <cfergeau@redhat.com> | 2016-10-28 11:56:47 +0200 |
---|---|---|
committer | Christophe Fergeau <cfergeau@redhat.com> | 2016-12-12 15:29:03 +0100 |
commit | 7657ffb8a5cba20f221c2af93e0c83b81356053c (patch) | |
tree | f16ae65f79f3eb50b6746513f070b45fc50223e3 | |
parent | 4783c5439552a461516a6d917765000a9b60c295 (diff) |
build: Error out when enabling xspice with X.Org 1.19
xspice needs to be updated to cope with some X.Org 1.19 API changes,
better to make that explicit at configure time rather than letting
people discover the hard way (it builds with warnings but will not work)
that it's broken.
-rw-r--r-- | configure.ac | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 451d42a..62ffb71 100644 --- a/configure.ac +++ b/configure.ac @@ -68,7 +68,8 @@ PKG_CHECK_EXISTS(xfont2, # Obtain compiler/linker options for the driver dependencies PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto $xfont_pc $REQUIRED_MODULES) - +# Check for xorg 1.19 as XSpice is currently not working with it +PKG_CHECK_EXISTS([xorg-server >= 1.18.99], [has_xorg119=yes]) save_CFLAGS="$CFLAGS" CFLAGS="$XORG_CFLAGS" @@ -139,7 +140,10 @@ if test "x$enable_xspice" = "xyes"; then AC_SUBST(SPICE_CFLAGS) AC_SUBST(SPICE_LIBS) ], -) + ) + if test x"${enable_xspice}" = "xyes" && test x"${has_xorg119}" = "xyes"; then + AC_MSG_ERROR("XSpice cannot currently work against X.Org 1.19") + fi else enable_xspice=no fi |