From 1428bab3b380a4b8083d8ecb30bce6cf0cd2ef9f Mon Sep 17 00:00:00 2001 From: Gabriel Jacobo Date: Thu, 1 Sep 2016 16:01:54 -0300 Subject: [PATCH] Fixes building SDL on Ubuntu 16.04 with Mir headers installed --- configure | 1 + configure.in | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/configure b/configure index e50dc1ec6..f8daa2054 100755 --- a/configure +++ b/configure @@ -18975,6 +18975,7 @@ main () { MirPointerButton button = mir_pointer_button_primary; + MirPointerConfinementState confined = mir_pointer_unconfined; ; return 0; diff --git a/configure.in b/configure.in index 6f3263fbc..691abe59c 100644 --- a/configure.in +++ b/configure.in @@ -1291,11 +1291,12 @@ AC_HELP_STRING([--enable-video-mir], [use Mir video driver [[default=yes]]]), save_CFLAGS="$CFLAGS" CFLAGS="$save_CFLAGS $MIR_CFLAGS" - dnl This will disable Mir on Ubuntu < 15.04 (Mir should be 0.14 at this point) + dnl This will disable Mir if >= v0.24 is not available AC_TRY_COMPILE([ #include ],[ MirPointerButton button = mir_pointer_button_primary; + MirPointerConfinementState confined = mir_pointer_unconfined; ],[ video_mir=yes ])