Browse Source

Fixes building SDL on Ubuntu 16.04 with Mir headers installed

Gabriel Jacobo 8 years ago
parent
commit
1428bab3b3
2 changed files with 3 additions and 1 deletions
  1. 1 0
      configure
  2. 2 1
      configure.in

+ 1 - 0
configure

@@ -18975,6 +18975,7 @@ main ()
 {
 
                     MirPointerButton button = mir_pointer_button_primary;
+                    MirPointerConfinementState confined = mir_pointer_unconfined;
 
   ;
   return 0;

+ 2 - 1
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 <mir_toolkit/mir_client_library.h>
                 ],[
                     MirPointerButton button = mir_pointer_button_primary;
+                    MirPointerConfinementState confined = mir_pointer_unconfined;
                 ],[
                 video_mir=yes
                 ])