configure.in
changeset 8774 3e2b3019a879
parent 8759 18eb59aa5913
child 8828 0b7aae26e494
     1.1 --- a/configure.in	Tue May 13 12:10:37 2014 -0700
     1.2 +++ b/configure.in	Tue May 13 19:42:40 2014 -0300
     1.3 @@ -1174,7 +1174,9 @@
     1.4          AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
     1.5          AC_MSG_CHECKING(for Wayland support)
     1.6          video_wayland=no
     1.7 -        if test x$PKG_CONFIG != xno; then
     1.8 +        if  test x$PKG_CONFIG != xno && \
     1.9 +            test x$video_opengl_egl = xyes && \
    1.10 +            test x$video_opengles_v2 = xyes; then
    1.11              if $PKG_CONFIG --exists wayland-client wayland-egl wayland-cursor egl xkbcommon ; then
    1.12                  WAYLAND_CFLAGS=`$PKG_CONFIG --cflags wayland-client wayland-egl wayland-cursor xkbcommon`
    1.13                  WAYLAND_LIBS=`$PKG_CONFIG --libs wayland-client wayland-egl wayland-cursor xkbcommon`
    1.14 @@ -1256,7 +1258,18 @@
    1.15              if $PKG_CONFIG --exists mirclient egl xkbcommon ; then
    1.16                  MIR_CFLAGS=`$PKG_CONFIG --cflags mirclient egl xkbcommon`
    1.17                  MIR_LIBS=`$PKG_CONFIG --libs mirclient egl xkbcommon`
    1.18 +                save_CFLAGS="$CFLAGS"
    1.19 +                CFLAGS="$save_CFLAGS $MIR_CFLAGS"
    1.20 +                
    1.21 +                dnl This will disable Mir on Ubuntu < 14.04
    1.22 +                AC_TRY_COMPILE([
    1.23 +                #include <mir_toolkit/mir_client_library.h>
    1.24 +                ],[
    1.25 +                    MirMotionToolType tool = mir_motion_tool_type_mouse;
    1.26 +                ],[
    1.27                  video_mir=yes
    1.28 +                ])
    1.29 +                CFLAGS="$save_CFLAGS"
    1.30              fi
    1.31          fi
    1.32          AC_MSG_RESULT($video_mir)
    1.33 @@ -2691,12 +2704,12 @@
    1.34          CheckNAS
    1.35          CheckSNDIO
    1.36          CheckX11
    1.37 -        CheckWayland
    1.38 -        CheckMir
    1.39          CheckDirectFB
    1.40          CheckFusionSound
    1.41          CheckOpenGLX11
    1.42          CheckOpenGLESX11
    1.43 +        CheckMir
    1.44 +        CheckWayland
    1.45          CheckLibUDev
    1.46          CheckDBus
    1.47          CheckInputEvents