configure
changeset 8774 3e2b3019a879
parent 8752 44d31ae3d104
child 8828 0b7aae26e494
equal deleted inserted replaced
8773:83077b1f989a 8774:3e2b3019a879
 18743 
 18743 
 18744 
 18744 
 18745         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Wayland support" >&5
 18745         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Wayland support" >&5
 18746 $as_echo_n "checking for Wayland support... " >&6; }
 18746 $as_echo_n "checking for Wayland support... " >&6; }
 18747         video_wayland=no
 18747         video_wayland=no
 18748         if test x$PKG_CONFIG != xno; then
 18748         if  test x$PKG_CONFIG != xno && \
       
 18749             test x$video_opengl_egl = xyes && \
       
 18750             test x$video_opengles_v2 = xyes; then
 18749             if $PKG_CONFIG --exists wayland-client wayland-egl wayland-cursor egl xkbcommon ; then
 18751             if $PKG_CONFIG --exists wayland-client wayland-egl wayland-cursor egl xkbcommon ; then
 18750                 WAYLAND_CFLAGS=`$PKG_CONFIG --cflags wayland-client wayland-egl wayland-cursor xkbcommon`
 18752                 WAYLAND_CFLAGS=`$PKG_CONFIG --cflags wayland-client wayland-egl wayland-cursor xkbcommon`
 18751                 WAYLAND_LIBS=`$PKG_CONFIG --libs wayland-client wayland-egl wayland-cursor xkbcommon`
 18753                 WAYLAND_LIBS=`$PKG_CONFIG --libs wayland-client wayland-egl wayland-cursor xkbcommon`
 18752                 video_wayland=yes
 18754                 video_wayland=yes
 18753             fi
 18755             fi
 18893         video_mir=no
 18895         video_mir=no
 18894         if test x$PKG_CONFIG != xno; then
 18896         if test x$PKG_CONFIG != xno; then
 18895             if $PKG_CONFIG --exists mirclient egl xkbcommon ; then
 18897             if $PKG_CONFIG --exists mirclient egl xkbcommon ; then
 18896                 MIR_CFLAGS=`$PKG_CONFIG --cflags mirclient egl xkbcommon`
 18898                 MIR_CFLAGS=`$PKG_CONFIG --cflags mirclient egl xkbcommon`
 18897                 MIR_LIBS=`$PKG_CONFIG --libs mirclient egl xkbcommon`
 18899                 MIR_LIBS=`$PKG_CONFIG --libs mirclient egl xkbcommon`
       
 18900                 save_CFLAGS="$CFLAGS"
       
 18901                 CFLAGS="$save_CFLAGS $MIR_CFLAGS"
       
 18902 
       
 18903                                 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
       
 18904 /* end confdefs.h.  */
       
 18905 
       
 18906                 #include <mir_toolkit/mir_client_library.h>
       
 18907 
       
 18908 int
       
 18909 main ()
       
 18910 {
       
 18911 
       
 18912                     MirMotionToolType tool = mir_motion_tool_type_mouse;
       
 18913 
       
 18914   ;
       
 18915   return 0;
       
 18916 }
       
 18917 _ACEOF
       
 18918 if ac_fn_c_try_compile "$LINENO"; then :
       
 18919 
 18898                 video_mir=yes
 18920                 video_mir=yes
       
 18921 
       
 18922 fi
       
 18923 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
       
 18924                 CFLAGS="$save_CFLAGS"
 18899             fi
 18925             fi
 18900         fi
 18926         fi
 18901         { $as_echo "$as_me:${as_lineno-$LINENO}: result: $video_mir" >&5
 18927         { $as_echo "$as_me:${as_lineno-$LINENO}: result: $video_mir" >&5
 18902 $as_echo "$video_mir" >&6; }
 18928 $as_echo "$video_mir" >&6; }
 18903 
 18929 
 22568                 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ldl -lGLESv1_CM -lGLESv2 -llog -landroid"
 22594                 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ldl -lGLESv1_CM -lGLESv2 -llog -landroid"
 22569 
 22595 
 22570                 if test x$enable_video = xyes; then
 22596                 if test x$enable_video = xyes; then
 22571                     SOURCES="$SOURCES $srcdir/src/core/android/*.c $srcdir/src/video/android/*.c"
 22597                     SOURCES="$SOURCES $srcdir/src/core/android/*.c $srcdir/src/video/android/*.c"
 22572                     $as_echo "#define SDL_VIDEO_DRIVER_ANDROID 1" >>confdefs.h
 22598                     $as_echo "#define SDL_VIDEO_DRIVER_ANDROID 1" >>confdefs.h
       
 22599                     SUMMARY_video="${SUMMARY_video} android"
 22573                 fi
 22600                 fi
 22574                 ;;
 22601                 ;;
 22575             *-*-linux*)         ARCH=linux ;;
 22602             *-*-linux*)         ARCH=linux ;;
 22576             *-*-uclinux*)       ARCH=linux ;;
 22603             *-*-uclinux*)       ARCH=linux ;;
 22577             *-*-kfreebsd*-gnu)  ARCH=kfreebsd-gnu ;;
 22604             *-*-kfreebsd*-gnu)  ARCH=kfreebsd-gnu ;;
 22600         CheckARTSC
 22627         CheckARTSC
 22601         CheckESD
 22628         CheckESD
 22602         CheckNAS
 22629         CheckNAS
 22603         CheckSNDIO
 22630         CheckSNDIO
 22604         CheckX11
 22631         CheckX11
 22605         CheckWayland
       
 22606         CheckMir
       
 22607         CheckDirectFB
 22632         CheckDirectFB
 22608         CheckFusionSound
 22633         CheckFusionSound
 22609         CheckOpenGLX11
 22634         CheckOpenGLX11
 22610         CheckOpenGLESX11
 22635         CheckOpenGLESX11
       
 22636         CheckMir
       
 22637         CheckWayland
 22611         CheckLibUDev
 22638         CheckLibUDev
 22612         CheckDBus
 22639         CheckDBus
 22613         CheckInputEvents
 22640         CheckInputEvents
 22614         CheckInputKD
 22641         CheckInputKD
 22615         CheckTslib
 22642         CheckTslib
 22645             android)
 22672             android)
 22646 
 22673 
 22647 $as_echo "#define SDL_AUDIO_DRIVER_ANDROID 1" >>confdefs.h
 22674 $as_echo "#define SDL_AUDIO_DRIVER_ANDROID 1" >>confdefs.h
 22648 
 22675 
 22649                 SOURCES="$SOURCES $srcdir/src/audio/android/*.c"
 22676                 SOURCES="$SOURCES $srcdir/src/audio/android/*.c"
       
 22677                 SUMMARY_audio="${SUMMARY_audio} android"
 22650                 have_audio=yes
 22678                 have_audio=yes
 22651             ;;
 22679             ;;
 22652           esac
 22680           esac
 22653         fi
 22681         fi
 22654         # Set up files for the joystick library
 22682         # Set up files for the joystick library