comparison configure.in @ 2710:44e49d3fa6cf

Final merge of Google Summer of Code 2008 work... Many-mouse and tablet support by Szymon Wilczek, mentored by Ryan C. Gordon Everything concerning the project is noted on the wiki: http://wilku.ravenlord.ws/doku.php?id=start
author Sam Lantinga <slouken@libsdl.org>
date Mon, 25 Aug 2008 06:33:00 +0000
parents 33052794de27
children 0906692aa6a4
comparison
equal deleted inserted replaced
2709:fd3f0f1147e7 2710:44e49d3fa6cf
1031 AC_DEFINE(SDL_VIDEO_DRIVER_X11) 1031 AC_DEFINE(SDL_VIDEO_DRIVER_X11)
1032 SOURCES="$SOURCES $srcdir/src/video/x11/*.c" 1032 SOURCES="$SOURCES $srcdir/src/video/x11/*.c"
1033 SOURCES="$SOURCES $srcdir/src/video/Xext/XmuStdCmap/*.c" 1033 SOURCES="$SOURCES $srcdir/src/video/Xext/XmuStdCmap/*.c"
1034 EXTRA_CFLAGS="$EXTRA_CFLAGS $X_CFLAGS" 1034 EXTRA_CFLAGS="$EXTRA_CFLAGS $X_CFLAGS"
1035 1035
1036 echo "FIXME: Need to get dynamic loading of XInput working"
1037 enable_x11_shared=no
1038
1036 if test x$enable_x11_shared = xmaybe; then 1039 if test x$enable_x11_shared = xmaybe; then
1037 enable_x11_shared=$x11_symbols_private 1040 enable_x11_shared=$x11_symbols_private
1038 fi 1041 fi
1039 if test x$have_loadso != xyes && \ 1042 if test x$have_loadso != xyes && \
1040 test x$enable_x11_shared = xyes; then 1043 test x$enable_x11_shared = xyes; then
1053 echo "-- dynamic libX11ext -> $x11ext_lib" 1056 echo "-- dynamic libX11ext -> $x11ext_lib"
1054 AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC, "$x11_lib") 1057 AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC, "$x11_lib")
1055 AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT, "$x11ext_lib") 1058 AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT, "$x11ext_lib")
1056 else 1059 else
1057 enable_x11_shared=no 1060 enable_x11_shared=no
1058 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $X_LIBS -lX11 -lXext" 1061 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $X_LIBS -lX11 -lXext -lXi"
1059 fi 1062 fi
1060 have_video=yes 1063 have_video=yes
1061 1064
1062 AC_ARG_ENABLE(video-x11-vm, 1065 AC_ARG_ENABLE(video-x11-vm,
1063 AC_HELP_STRING([--enable-video-x11-vm], [use X11 VM extension for fullscreen [[default=yes]]]), 1066 AC_HELP_STRING([--enable-video-x11-vm], [use X11 VM extension for fullscreen [[default=yes]]]),