Enable Wayland and Mir in configure/cmake scripts, now that 2.0.2 has shipped.
authorRyan C. Gordon <icculus@icculus.org>
Sat, 08 Mar 2014 15:32:12 -0500
changeset 8299ee0d04aa70da
parent 8298 28cfd3a2886f
child 8300 8393682d9d96
Enable Wayland and Mir in configure/cmake scripts, now that 2.0.2 has shipped.
CMakeLists.txt
configure
configure.in
     1.1 --- a/CMakeLists.txt	Fri Mar 07 23:16:24 2014 -0800
     1.2 +++ b/CMakeLists.txt	Sat Mar 08 15:32:12 2014 -0500
     1.3 @@ -235,8 +235,8 @@
     1.4  set_option(CLOCK_GETTIME       "Use clock_gettime() instead of gettimeofday()" OFF)
     1.5  set_option(INPUT_TSLIB         "Use the Touchscreen library for input" ${UNIX_SYS})
     1.6  set_option(VIDEO_X11           "Use X11 video driver" ${UNIX_SYS})
     1.7 -set_option(VIDEO_WAYLAND       "Use Wayland video driver" OFF) #${UNIX_SYS})
     1.8 -set_option(VIDEO_MIR           "Use Mir video driver" OFF) #${UNIX_SYS})
     1.9 +set_option(VIDEO_WAYLAND       "Use Wayland video driver" ${UNIX_SYS})
    1.10 +set_option(VIDEO_MIR           "Use Mir video driver" ${UNIX_SYS})
    1.11  dep_option(X11_SHARED          "Dynamically load X11 support" ON "VIDEO_X11" OFF)
    1.12  set(SDL_X11_OPTIONS Xcursor Xinerama XInput Xrandr Xscrnsaver XShape Xvm)
    1.13  foreach(_SUB ${SDL_X11_OPTIONS})
     2.1 --- a/configure	Fri Mar 07 23:16:24 2014 -0800
     2.2 +++ b/configure	Sat Mar 08 15:32:12 2014 -0500
     2.3 @@ -18688,9 +18688,9 @@
     2.4  if test "${enable_video_wayland+set}" = set; then :
     2.5    enableval=$enable_video_wayland;
     2.6  else
     2.7 -  enable_video_wayland=no
     2.8 -fi
     2.9 - #yes)
    2.10 +  enable_video_wayland=yes
    2.11 +fi
    2.12 +
    2.13  
    2.14      # Check whether --enable-video-wayland-qt-touch was given.
    2.15  if test "${enable_video_wayland_qt_touch+set}" = set; then :
    2.16 @@ -18842,9 +18842,9 @@
    2.17  if test "${enable_video_mir+set}" = set; then :
    2.18    enableval=$enable_video_mir;
    2.19  else
    2.20 -  enable_video_mir=no
    2.21 -fi
    2.22 - #yes)
    2.23 +  enable_video_mir=yes
    2.24 +fi
    2.25 +
    2.26  
    2.27      if test x$enable_video = xyes -a x$enable_video_mir = xyes; then
    2.28          # Extract the first word of "pkg-config", so it can be a program name with args.
     3.1 --- a/configure.in	Fri Mar 07 23:16:24 2014 -0800
     3.2 +++ b/configure.in	Sat Mar 08 15:32:12 2014 -0500
     3.3 @@ -1164,7 +1164,7 @@
     3.4  {
     3.5      AC_ARG_ENABLE(video-wayland,
     3.6  AC_HELP_STRING([--enable-video-wayland], [use Wayland video driver [[default=yes]]]),
     3.7 -                  ,enable_video_wayland=no) #yes)
     3.8 +                  ,enable_video_wayland=yes)
     3.9  
    3.10      AC_ARG_ENABLE(video-wayland-qt-touch,
    3.11  AC_HELP_STRING([--enable-video-wayland-qt-touch], [QtWayland server support for Wayland video driver [[default=yes]]]),
    3.12 @@ -1246,7 +1246,7 @@
    3.13  {
    3.14      AC_ARG_ENABLE(video-mir,
    3.15  AC_HELP_STRING([--enable-video-mir], [use Mir video driver [[default=yes]]]),
    3.16 -                  ,enable_video_mir=no) #yes)
    3.17 +                  ,enable_video_mir=yes)
    3.18  
    3.19      if test x$enable_video = xyes -a x$enable_video_mir = xyes; then
    3.20          AC_PATH_PROG(PKG_CONFIG, pkg-config, no)