configure
changeset 12391 ca6e41ade79a
parent 12390 60f322c5984f
child 12429 682d6359c430
     1.1 --- a/configure	Fri Nov 02 18:07:11 2018 -0700
     1.2 +++ b/configure	Fri Nov 02 21:34:17 2018 -0400
     1.3 @@ -831,8 +831,6 @@
     1.4  enable_video_wayland
     1.5  enable_video_wayland_qt_touch
     1.6  enable_wayland_shared
     1.7 -enable_video_mir
     1.8 -enable_mir_shared
     1.9  enable_video_rpi
    1.10  enable_video_x11
    1.11  with_x
    1.12 @@ -1576,8 +1574,6 @@
    1.13                            QtWayland server support for Wayland video driver
    1.14                            [[default=yes]]
    1.15    --enable-wayland-shared dynamically load Wayland support [[default=maybe]]
    1.16 -  --enable-video-mir      use Mir video driver [[default=no]]
    1.17 -  --enable-mir-shared     dynamically load Mir support [[default=maybe]]
    1.18    --enable-video-rpi      use Raspberry Pi video driver [[default=yes]]
    1.19    --enable-video-x11      use X11 video driver [[default=yes]]
    1.20    --enable-x11-shared     dynamically load X11 support [[default=maybe]]
    1.21 @@ -19422,152 +19418,6 @@
    1.22      fi
    1.23  }
    1.24  
    1.25 -CheckMir()
    1.26 -{
    1.27 -    # Check whether --enable-video-mir was given.
    1.28 -if test "${enable_video_mir+set}" = set; then :
    1.29 -  enableval=$enable_video_mir;
    1.30 -else
    1.31 -  enable_video_mir=no
    1.32 -fi
    1.33 -
    1.34 -
    1.35 -    if test x$enable_video = xyes -a x$enable_video_mir = xyes; then
    1.36 -        # Extract the first word of "pkg-config", so it can be a program name with args.
    1.37 -set dummy pkg-config; ac_word=$2
    1.38 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    1.39 -$as_echo_n "checking for $ac_word... " >&6; }
    1.40 -if ${ac_cv_path_PKG_CONFIG+:} false; then :
    1.41 -  $as_echo_n "(cached) " >&6
    1.42 -else
    1.43 -  case $PKG_CONFIG in
    1.44 -  [\\/]* | ?:[\\/]*)
    1.45 -  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
    1.46 -  ;;
    1.47 -  *)
    1.48 -  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    1.49 -for as_dir in $PATH
    1.50 -do
    1.51 -  IFS=$as_save_IFS
    1.52 -  test -z "$as_dir" && as_dir=.
    1.53 -    for ac_exec_ext in '' $ac_executable_extensions; do
    1.54 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    1.55 -    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
    1.56 -    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    1.57 -    break 2
    1.58 -  fi
    1.59 -done
    1.60 -  done
    1.61 -IFS=$as_save_IFS
    1.62 -
    1.63 -  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
    1.64 -  ;;
    1.65 -esac
    1.66 -fi
    1.67 -PKG_CONFIG=$ac_cv_path_PKG_CONFIG
    1.68 -if test -n "$PKG_CONFIG"; then
    1.69 -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
    1.70 -$as_echo "$PKG_CONFIG" >&6; }
    1.71 -else
    1.72 -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    1.73 -$as_echo "no" >&6; }
    1.74 -fi
    1.75 -
    1.76 -
    1.77 -        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mir support" >&5
    1.78 -$as_echo_n "checking for Mir support... " >&6; }
    1.79 -        video_mir=no
    1.80 -        if test x$PKG_CONFIG != xno; then
    1.81 -            if $PKG_CONFIG --exists mirclient egl xkbcommon ; then
    1.82 -                MIR_CFLAGS=`$PKG_CONFIG --cflags mirclient egl xkbcommon`
    1.83 -                MIR_LIBS=`$PKG_CONFIG --libs mirclient egl xkbcommon`
    1.84 -                save_CFLAGS="$CFLAGS"
    1.85 -                CFLAGS="$save_CFLAGS $MIR_CFLAGS"
    1.86 -
    1.87 -                                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    1.88 -/* end confdefs.h.  */
    1.89 -
    1.90 -                #include <mir_toolkit/mir_client_library.h>
    1.91 -
    1.92 -int
    1.93 -main ()
    1.94 -{
    1.95 -
    1.96 -                    MirWindowAttrib attrib = mir_window_attrib_state
    1.97 -
    1.98 -  ;
    1.99 -  return 0;
   1.100 -}
   1.101 -_ACEOF
   1.102 -if ac_fn_c_try_compile "$LINENO"; then :
   1.103 -
   1.104 -                video_mir=yes
   1.105 -
   1.106 -fi
   1.107 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   1.108 -                CFLAGS="$save_CFLAGS"
   1.109 -            fi
   1.110 -        fi
   1.111 -        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $video_mir" >&5
   1.112 -$as_echo "$video_mir" >&6; }
   1.113 -
   1.114 -        if test x$video_mir = xyes; then
   1.115 -
   1.116 -$as_echo "#define SDL_VIDEO_DRIVER_MIR 1" >>confdefs.h
   1.117 -
   1.118 -            SOURCES="$SOURCES $srcdir/src/video/mir/*.c"
   1.119 -            EXTRA_CFLAGS="$EXTRA_CFLAGS $MIR_CFLAGS"
   1.120 -            # Check whether --enable-mir-shared was given.
   1.121 -if test "${enable_mir_shared+set}" = set; then :
   1.122 -  enableval=$enable_mir_shared;
   1.123 -else
   1.124 -  enable_mir_shared=maybe
   1.125 -fi
   1.126 -
   1.127 -
   1.128 -                        case "$host" in
   1.129 -                *)
   1.130 -                    mirclient_lib=`find_lib "libmirclient.so.*" "$MIR_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`
   1.131 -                    xkbcommon_lib=`find_lib "libxkbcommon.so.*" "$MIR_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`
   1.132 -                    ;;
   1.133 -            esac
   1.134 -
   1.135 -            if test x$enable_mir_shared = xmaybe; then
   1.136 -                enable_mir_shared=yes
   1.137 -            fi
   1.138 -            if test x$have_loadso != xyes && \
   1.139 -               test x$enable_mir_shared = xyes; then
   1.140 -                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You must have SDL_LoadObject() support for dynamic Mir loading" >&5
   1.141 -$as_echo "$as_me: WARNING: You must have SDL_LoadObject() support for dynamic Mir loading" >&2;}
   1.142 -                enable_mir_shared=no
   1.143 -            fi
   1.144 -            if test x$have_loadso = xyes && \
   1.145 -               test x$enable_mir_shared = xyes && \
   1.146 -               test x$mirclient_lib != x && \
   1.147 -               test x$xkbcommon_lib != x; then
   1.148 -                echo "-- dynamic libmirclient -> $mirclient_lib"
   1.149 -                echo "-- dynamic libxkbcommon -> $xkbcommon_lib"
   1.150 -
   1.151 -cat >>confdefs.h <<_ACEOF
   1.152 -#define SDL_VIDEO_DRIVER_MIR_DYNAMIC "$mirclient_lib"
   1.153 -_ACEOF
   1.154 -
   1.155 -
   1.156 -cat >>confdefs.h <<_ACEOF
   1.157 -#define SDL_VIDEO_DRIVER_MIR_DYNAMIC_XKBCOMMON "$xkbcommon_lib"
   1.158 -_ACEOF
   1.159 -
   1.160 -                SUMMARY_video="${SUMMARY_video} mir(dynamic)"
   1.161 -            else
   1.162 -                enable_mir_shared=no
   1.163 -                EXTRA_LDFLAGS="$EXTRA_LDFLAGS $MIR_LIBS"
   1.164 -                SUMMARY_video="${SUMMARY_video} mir"
   1.165 -            fi
   1.166 -            have_video=yes
   1.167 -        fi
   1.168 -    fi
   1.169 -}
   1.170 -
   1.171  CheckNativeClient()
   1.172  {
   1.173          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   1.174 @@ -24153,7 +24003,6 @@
   1.175          CheckOpenGLX11
   1.176          CheckOpenGLESX11
   1.177          CheckVulkan
   1.178 -        CheckMir
   1.179          CheckWayland
   1.180          CheckLibUDev
   1.181          CheckDBus