configure
changeset 5408 35a63789c3f2
parent 5389 24903690f48a
child 5410 12bc832d3fa8
     1.1 --- a/configure	Sun Feb 27 22:22:58 2011 -0800
     1.2 +++ b/configure	Mon Feb 28 09:01:53 2011 -0800
     1.3 @@ -1537,20 +1537,19 @@
     1.4    --enable-dummyaudio     support the dummy audio driver [default=yes]
     1.5    --enable-video-x11      use X11 video driver [default=yes]
     1.6    --enable-x11-shared     dynamically load X11 support [default=maybe]
     1.7 -  --enable-video-x11-vm   use X11 VM extension for fullscreen [default=yes]
     1.8 -  --enable-video-x11-xv   use X11 XvImage extension for video [default=yes]
     1.9    --enable-video-x11-xinerama
    1.10                            enable X11 Xinerama support [default=yes]
    1.11 -  --enable-video-x11-xshape
    1.12 -                          enable X11 XShape support [default=yes]
    1.13 +  --enable-video-x11-xinput
    1.14 +                          enable X11 XInput extension for manymouse, tablets,
    1.15 +                          etc [default=yes]
    1.16    --enable-video-x11-xrandr
    1.17                            enable X11 Xrandr extension for fullscreen
    1.18                            [default=yes]
    1.19 -  --enable-video-x11-xinput
    1.20 -                          enable X11 XInput extension for manymouse, tablets,
    1.21 -                          etc [default=yes]
    1.22    --enable-video-x11-scrnsaver
    1.23                            enable X11 screensaver extension [default=yes]
    1.24 +  --enable-video-x11-xshape
    1.25 +                          enable X11 XShape support [default=yes]
    1.26 +  --enable-video-x11-vm   use X11 VM extension for fullscreen [default=yes]
    1.27    --enable-video-cocoa    use Cocoa video driver [default=yes]
    1.28    --enable-video-directfb use DirectFB video driver [default=no]
    1.29    --enable-directfb-shared
    1.30 @@ -3770,13 +3769,13 @@
    1.31  else
    1.32    lt_cv_nm_interface="BSD nm"
    1.33    echo "int some_variable = 0;" > conftest.$ac_ext
    1.34 -  (eval echo "\"\$as_me:3773: $ac_compile\"" >&5)
    1.35 +  (eval echo "\"\$as_me:3772: $ac_compile\"" >&5)
    1.36    (eval "$ac_compile" 2>conftest.err)
    1.37    cat conftest.err >&5
    1.38 -  (eval echo "\"\$as_me:3776: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
    1.39 +  (eval echo "\"\$as_me:3775: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
    1.40    (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
    1.41    cat conftest.err >&5
    1.42 -  (eval echo "\"\$as_me:3779: output\"" >&5)
    1.43 +  (eval echo "\"\$as_me:3778: output\"" >&5)
    1.44    cat conftest.out >&5
    1.45    if $GREP 'External.*some_variable' conftest.out > /dev/null; then
    1.46      lt_cv_nm_interface="MS dumpbin"
    1.47 @@ -5003,7 +5002,7 @@
    1.48    ;;
    1.49  *-*-irix6*)
    1.50    # Find out which ABI we are using.
    1.51 -  echo '#line 5006 "configure"' > conftest.$ac_ext
    1.52 +  echo '#line 5005 "configure"' > conftest.$ac_ext
    1.53    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    1.54    (eval $ac_compile) 2>&5
    1.55    ac_status=$?
    1.56 @@ -7164,11 +7163,11 @@
    1.57     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    1.58     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1.59     -e 's:$: $lt_compiler_flag:'`
    1.60 -   (eval echo "\"\$as_me:7167: $lt_compile\"" >&5)
    1.61 +   (eval echo "\"\$as_me:7166: $lt_compile\"" >&5)
    1.62     (eval "$lt_compile" 2>conftest.err)
    1.63     ac_status=$?
    1.64     cat conftest.err >&5
    1.65 -   echo "$as_me:7171: \$? = $ac_status" >&5
    1.66 +   echo "$as_me:7170: \$? = $ac_status" >&5
    1.67     if (exit $ac_status) && test -s "$ac_outfile"; then
    1.68       # The compiler can only warn and ignore the option if not recognized
    1.69       # So say no if there are warnings other than the usual output.
    1.70 @@ -7503,11 +7502,11 @@
    1.71     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    1.72     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1.73     -e 's:$: $lt_compiler_flag:'`
    1.74 -   (eval echo "\"\$as_me:7506: $lt_compile\"" >&5)
    1.75 +   (eval echo "\"\$as_me:7505: $lt_compile\"" >&5)
    1.76     (eval "$lt_compile" 2>conftest.err)
    1.77     ac_status=$?
    1.78     cat conftest.err >&5
    1.79 -   echo "$as_me:7510: \$? = $ac_status" >&5
    1.80 +   echo "$as_me:7509: \$? = $ac_status" >&5
    1.81     if (exit $ac_status) && test -s "$ac_outfile"; then
    1.82       # The compiler can only warn and ignore the option if not recognized
    1.83       # So say no if there are warnings other than the usual output.
    1.84 @@ -7608,11 +7607,11 @@
    1.85     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    1.86     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1.87     -e 's:$: $lt_compiler_flag:'`
    1.88 -   (eval echo "\"\$as_me:7611: $lt_compile\"" >&5)
    1.89 +   (eval echo "\"\$as_me:7610: $lt_compile\"" >&5)
    1.90     (eval "$lt_compile" 2>out/conftest.err)
    1.91     ac_status=$?
    1.92     cat out/conftest.err >&5
    1.93 -   echo "$as_me:7615: \$? = $ac_status" >&5
    1.94 +   echo "$as_me:7614: \$? = $ac_status" >&5
    1.95     if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1.96     then
    1.97       # The compiler can only warn and ignore the option if not recognized
    1.98 @@ -7663,11 +7662,11 @@
    1.99     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   1.100     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   1.101     -e 's:$: $lt_compiler_flag:'`
   1.102 -   (eval echo "\"\$as_me:7666: $lt_compile\"" >&5)
   1.103 +   (eval echo "\"\$as_me:7665: $lt_compile\"" >&5)
   1.104     (eval "$lt_compile" 2>out/conftest.err)
   1.105     ac_status=$?
   1.106     cat out/conftest.err >&5
   1.107 -   echo "$as_me:7670: \$? = $ac_status" >&5
   1.108 +   echo "$as_me:7669: \$? = $ac_status" >&5
   1.109     if (exit $ac_status) && test -s out/conftest2.$ac_objext
   1.110     then
   1.111       # The compiler can only warn and ignore the option if not recognized
   1.112 @@ -10421,7 +10420,7 @@
   1.113    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   1.114    lt_status=$lt_dlunknown
   1.115    cat > conftest.$ac_ext <<_LT_EOF
   1.116 -#line 10424 "configure"
   1.117 +#line 10423 "configure"
   1.118  #include "confdefs.h"
   1.119  
   1.120  #if HAVE_DLFCN_H
   1.121 @@ -10517,7 +10516,7 @@
   1.122    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   1.123    lt_status=$lt_dlunknown
   1.124    cat > conftest.$ac_ext <<_LT_EOF
   1.125 -#line 10520 "configure"
   1.126 +#line 10519 "configure"
   1.127  #include "confdefs.h"
   1.128  
   1.129  #if HAVE_DLFCN_H
   1.130 @@ -14199,11 +14198,11 @@
   1.131     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   1.132     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   1.133     -e 's:$: $lt_compiler_flag:'`
   1.134 -   (eval echo "\"\$as_me:14202: $lt_compile\"" >&5)
   1.135 +   (eval echo "\"\$as_me:14201: $lt_compile\"" >&5)
   1.136     (eval "$lt_compile" 2>conftest.err)
   1.137     ac_status=$?
   1.138     cat conftest.err >&5
   1.139 -   echo "$as_me:14206: \$? = $ac_status" >&5
   1.140 +   echo "$as_me:14205: \$? = $ac_status" >&5
   1.141     if (exit $ac_status) && test -s "$ac_outfile"; then
   1.142       # The compiler can only warn and ignore the option if not recognized
   1.143       # So say no if there are warnings other than the usual output.
   1.144 @@ -14298,11 +14297,11 @@
   1.145     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   1.146     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   1.147     -e 's:$: $lt_compiler_flag:'`
   1.148 -   (eval echo "\"\$as_me:14301: $lt_compile\"" >&5)
   1.149 +   (eval echo "\"\$as_me:14300: $lt_compile\"" >&5)
   1.150     (eval "$lt_compile" 2>out/conftest.err)
   1.151     ac_status=$?
   1.152     cat out/conftest.err >&5
   1.153 -   echo "$as_me:14305: \$? = $ac_status" >&5
   1.154 +   echo "$as_me:14304: \$? = $ac_status" >&5
   1.155     if (exit $ac_status) && test -s out/conftest2.$ac_objext
   1.156     then
   1.157       # The compiler can only warn and ignore the option if not recognized
   1.158 @@ -14350,11 +14349,11 @@
   1.159     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   1.160     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   1.161     -e 's:$: $lt_compiler_flag:'`
   1.162 -   (eval echo "\"\$as_me:14353: $lt_compile\"" >&5)
   1.163 +   (eval echo "\"\$as_me:14352: $lt_compile\"" >&5)
   1.164     (eval "$lt_compile" 2>out/conftest.err)
   1.165     ac_status=$?
   1.166     cat out/conftest.err >&5
   1.167 -   echo "$as_me:14357: \$? = $ac_status" >&5
   1.168 +   echo "$as_me:14356: \$? = $ac_status" >&5
   1.169     if (exit $ac_status) && test -s out/conftest2.$ac_objext
   1.170     then
   1.171       # The compiler can only warn and ignore the option if not recognized
   1.172 @@ -24086,12 +24085,12 @@
   1.173                      x11_symbols_private=yes
   1.174                      x11_lib='/usr/X11R6/lib/libX11.6.dylib'
   1.175                      x11ext_lib='/usr/X11R6/lib/libXext.6.dylib'
   1.176 -                    xrender_lib='/usr/X11R6/lib/libXrender.1.dylib'
   1.177 -                    xrandr_lib='/usr/X11R6/lib/libXrandr.2.dylib'
   1.178 +                    xinerama_lib='/usr/X11R6/lib/libXinerama.1.dylib'
   1.179                      xinput_lib='/usr/X11R6/lib/libXi.6.dylib'
   1.180 -                    xss_lib='/usr/X11R6/lib/libXss.6.dylib'
   1.181 -                    xdamage_lib='/usr/X11R6/lib/libXdamage.1.dylib'
   1.182 -                    xfixes_lib='/usr/X11R6/lib/libXfixes.3.dylib'
   1.183 +                    xrandr_lib='/usr/X11R6/lib/libXrandr.2.dylib'
   1.184 +                    xrender_lib='/usr/X11R6/lib/libXrender.1.dylib'
   1.185 +                    xss_lib='/usr/X11R6/lib/libXss.1.dylib'
   1.186 +                    xvidmode_lib='/usr/X11R6/lib/libXxf86vm.1.dylib'
   1.187                      ;;
   1.188                  *-*-osf*)
   1.189                      x11_lib='libX11.so'
   1.190 @@ -24104,12 +24103,12 @@
   1.191                  *)
   1.192                      x11_lib=`find_lib "libX11.so.*" "$X_LIBS -L/usr/X11/$base_libdir -L/usr/X11R6/$base_libdir" | sed 's/.*\/\(.*\)/\1/; q'`
   1.193                      x11ext_lib=`find_lib "libXext.so.*" "$X_LIBS -L/usr/X11/$base_libdir -L/usr/X11R6/$base_libdir" | sed 's/.*\/\(.*\)/\1/; q'`
   1.194 -                    xrender_lib=`find_lib "libXrender.so.*" "$X_LIBS -L/usr/X11/$base_libdir -L/usr/X11R6/$base_libdir" | sed 's/.*\/\(.*\)/\1/; q'`
   1.195 -                    xrandr_lib=`find_lib "libXrandr.so.*" "$X_LIBS -L/usr/X11/$base_libdir -L/usr/X11R6/$base_libdir" | sed 's/.*\/\(.*\)/\1/; q'`
   1.196 +                    xinerama_lib=`find_lib "libXinerama.so.*" "$X_LIBS -L/usr/X11/$base_libdir -L/usr/X11R6/$base_libdir" | sed 's/.*\/\(.*\)/\1/; q'`
   1.197                      xinput_lib=`find_lib "libXi.so.*" "$X_LIBS -L/usr/X11/$base_libdir -L/usr/X11R6/$base_libdir" | sed 's/.*\/\(.*\)/\1/; q'`
   1.198 +                    xrandr_lib=`find_lib "libXrandr.so.*" "$X_LIBS -L/usr/X11/$base_libdir -L/usr/X11R6/$base_libdir" | sed 's/.*\/\(.*\)/\1/; q'`
   1.199 +                    xrender_lib=`find_lib "libXrender.so.*" "$X_LIBS -L/usr/X11/$base_libdir -L/usr/X11R6/$base_libdir" | sed 's/.*\/\(.*\)/\1/; q'`
   1.200                      xss_lib=`find_lib "libXss.so.*" "$X_LIBS -L/usr/X11/$base_libdir -L/usr/X11R6/$base_libdir" | sed 's/.*\/\(.*\)/\1/; q'`
   1.201 -                    xdamage_lib=`find_lib "libXdamage.so.*" "$X_LIBS -L/usr/X11/$base_libdir -L/usr/X11R6/$base_libdir" | sed 's/.*\/\(.*\)/\1/; q'`
   1.202 -                    xfixes_lib=`find_lib "libXfixes.so.*" "$X_LIBS -L/usr/X11/$base_libdir -L/usr/X11R6/$base_libdir" | sed 's/.*\/\(.*\)/\1/; q'`
   1.203 +                    xvidmode_lib=`find_lib "libXxf86vm.so.*" "$X_LIBS -L/usr/X11/$base_libdir -L/usr/X11R6/$base_libdir" | sed 's/.*\/\(.*\)/\1/; q'`
   1.204                      ;;
   1.205              esac
   1.206  
   1.207 @@ -24160,34 +24159,6 @@
   1.208              fi
   1.209              have_video=yes
   1.210  
   1.211 -            # Check whether --enable-video-x11-vm was given.
   1.212 -if test "${enable_video_x11_vm+set}" = set; then
   1.213 -  enableval=$enable_video_x11_vm;
   1.214 -else
   1.215 -  enable_video_x11_vm=yes
   1.216 -fi
   1.217 -
   1.218 -            if test x$enable_video_x11_vm = xyes; then
   1.219 -                cat >>confdefs.h <<\_ACEOF
   1.220 -#define SDL_VIDEO_DRIVER_X11_VIDMODE 1
   1.221 -_ACEOF
   1.222 -
   1.223 -                SOURCES="$SOURCES $srcdir/src/video/Xext/Xxf86vm/*.c"
   1.224 -            fi
   1.225 -            # Check whether --enable-video-x11-xv was given.
   1.226 -if test "${enable_video_x11_xv+set}" = set; then
   1.227 -  enableval=$enable_video_x11_xv;
   1.228 -else
   1.229 -  enable_video_x11_xv=yes
   1.230 -fi
   1.231 -
   1.232 -            if test x$enable_video_x11_xv = xyes; then
   1.233 -                cat >>confdefs.h <<\_ACEOF
   1.234 -#define SDL_VIDEO_DRIVER_X11_XV 1
   1.235 -_ACEOF
   1.236 -
   1.237 -                SOURCES="$SOURCES $srcdir/src/video/Xext/Xv/*.c"
   1.238 -            fi
   1.239              # Check whether --enable-video-x11-xinerama was given.
   1.240  if test "${enable_video_x11_xinerama+set}" = set; then
   1.241    enableval=$enable_video_x11_xinerama;
   1.242 @@ -24196,23 +24167,10 @@
   1.243  fi
   1.244  
   1.245              if test x$enable_video_x11_xinerama = xyes; then
   1.246 -                cat >>confdefs.h <<\_ACEOF
   1.247 -#define SDL_VIDEO_DRIVER_X11_XINERAMA 1
   1.248 -_ACEOF
   1.249 -
   1.250 -                SOURCES="$SOURCES $srcdir/src/video/Xext/Xinerama/*.c"
   1.251 -            fi
   1.252 -            # Check whether --enable-video-x11-xshape was given.
   1.253 -if test "${enable_video_x11_xshape+set}" = set; then
   1.254 -  enableval=$enable_video_x11_xshape;
   1.255 -else
   1.256 -  enable_video_x11_xshape=yes
   1.257 -fi
   1.258 -
   1.259 -            if test x$enable_video_x11_xshape = xyes; then
   1.260 -                { echo "$as_me:$LINENO: checking for X11/extensions/shape.h" >&5
   1.261 -echo $ECHO_N "checking for X11/extensions/shape.h... $ECHO_C" >&6; }
   1.262 -if test "${ac_cv_header_X11_extensions_shape_h+set}" = set; then
   1.263 +                definitely_enable_video_x11_xinerama=no
   1.264 +                { echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5
   1.265 +echo $ECHO_N "checking for X11/extensions/Xinerama.h... $ECHO_C" >&6; }
   1.266 +if test "${ac_cv_header_X11_extensions_Xinerama_h+set}" = set; then
   1.267    echo $ECHO_N "(cached) $ECHO_C" >&6
   1.268  else
   1.269    cat >conftest.$ac_ext <<_ACEOF
   1.270 @@ -24224,196 +24182,128 @@
   1.271  #include <X11/Xlib.h>
   1.272  
   1.273  
   1.274 -#include <X11/extensions/shape.h>
   1.275 -_ACEOF
   1.276 -rm -f conftest.$ac_objext
   1.277 -if { (ac_try="$ac_compile"
   1.278 -case "(($ac_try" in
   1.279 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   1.280 -  *) ac_try_echo=$ac_try;;
   1.281 -esac
   1.282 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   1.283 -  (eval "$ac_compile") 2>conftest.er1
   1.284 -  ac_status=$?
   1.285 -  grep -v '^ *+' conftest.er1 >conftest.err
   1.286 -  rm -f conftest.er1
   1.287 -  cat conftest.err >&5
   1.288 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   1.289 -  (exit $ac_status); } && {
   1.290 -	 test -z "$ac_c_werror_flag" ||
   1.291 -	 test ! -s conftest.err
   1.292 -       } && test -s conftest.$ac_objext; then
   1.293 -  ac_cv_header_X11_extensions_shape_h=yes
   1.294 -else
   1.295 -  echo "$as_me: failed program was:" >&5
   1.296 -sed 's/^/| /' conftest.$ac_ext >&5
   1.297 -
   1.298 -	ac_cv_header_X11_extensions_shape_h=no
   1.299 -fi
   1.300 -
   1.301 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   1.302 -fi
   1.303 -{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_shape_h" >&5
   1.304 -echo "${ECHO_T}$ac_cv_header_X11_extensions_shape_h" >&6; }
   1.305 -if test $ac_cv_header_X11_extensions_shape_h = yes; then
   1.306 -  have_shape_h_hdr=yes
   1.307 -else
   1.308 -  have_shape_h_hdr=no
   1.309 -fi
   1.310 -
   1.311 -
   1.312 -                if test x$have_shape_h_hdr = xyes; then
   1.313 -                    cat >>confdefs.h <<\_ACEOF
   1.314 -#define SDL_VIDEO_DRIVER_X11_XSHAPE 1
   1.315 -_ACEOF
   1.316 -
   1.317 -                fi
   1.318 -            fi
   1.319 -            # Check whether --enable-video-x11-xrandr was given.
   1.320 -if test "${enable_video_x11_xrandr+set}" = set; then
   1.321 -  enableval=$enable_video_x11_xrandr;
   1.322 -else
   1.323 -  enable_video_x11_xrandr=yes
   1.324 -fi
   1.325 -
   1.326 -            if test x$enable_video_x11_xrandr = xyes; then
   1.327 -                definitely_enable_video_x11_xrandr=no
   1.328 -                { echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5
   1.329 -echo $ECHO_N "checking for X11/extensions/Xrandr.h... $ECHO_C" >&6; }
   1.330 -if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then
   1.331 -  echo $ECHO_N "(cached) $ECHO_C" >&6
   1.332 -else
   1.333 -  cat >conftest.$ac_ext <<_ACEOF
   1.334 -/* confdefs.h.  */
   1.335 -_ACEOF
   1.336 -cat confdefs.h >>conftest.$ac_ext
   1.337 -cat >>conftest.$ac_ext <<_ACEOF
   1.338 -/* end confdefs.h.  */
   1.339 -#include <X11/Xlib.h>
   1.340 -
   1.341 -
   1.342 -#include <X11/extensions/Xrandr.h>
   1.343 -_ACEOF
   1.344 -rm -f conftest.$ac_objext
   1.345 -if { (ac_try="$ac_compile"
   1.346 -case "(($ac_try" in
   1.347 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   1.348 -  *) ac_try_echo=$ac_try;;
   1.349 -esac
   1.350 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   1.351 -  (eval "$ac_compile") 2>conftest.er1
   1.352 -  ac_status=$?
   1.353 -  grep -v '^ *+' conftest.er1 >conftest.err
   1.354 -  rm -f conftest.er1
   1.355 -  cat conftest.err >&5
   1.356 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   1.357 -  (exit $ac_status); } && {
   1.358 -	 test -z "$ac_c_werror_flag" ||
   1.359 -	 test ! -s conftest.err
   1.360 -       } && test -s conftest.$ac_objext; then
   1.361 -  ac_cv_header_X11_extensions_Xrandr_h=yes
   1.362 -else
   1.363 -  echo "$as_me: failed program was:" >&5
   1.364 -sed 's/^/| /' conftest.$ac_ext >&5
   1.365 -
   1.366 -	ac_cv_header_X11_extensions_Xrandr_h=no
   1.367 -fi
   1.368 -
   1.369 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   1.370 -fi
   1.371 -{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5
   1.372 -echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrandr_h" >&6; }
   1.373 -if test $ac_cv_header_X11_extensions_Xrandr_h = yes; then
   1.374 -  have_xrandr_h_hdr=yes
   1.375 -else
   1.376 -  have_xrandr_h_hdr=no
   1.377 -fi
   1.378 -
   1.379 -
   1.380 -                if test x$have_xrandr_h_hdr = xyes; then
   1.381 -                    if test x$enable_x11_shared = xyes && test x$xrandr_lib != x ; then
   1.382 -                        echo "-- dynamic libXrandr -> $xrandr_lib"
   1.383 +#include <X11/extensions/Xinerama.h>
   1.384 +_ACEOF
   1.385 +rm -f conftest.$ac_objext
   1.386 +if { (ac_try="$ac_compile"
   1.387 +case "(($ac_try" in
   1.388 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   1.389 +  *) ac_try_echo=$ac_try;;
   1.390 +esac
   1.391 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   1.392 +  (eval "$ac_compile") 2>conftest.er1
   1.393 +  ac_status=$?
   1.394 +  grep -v '^ *+' conftest.er1 >conftest.err
   1.395 +  rm -f conftest.er1
   1.396 +  cat conftest.err >&5
   1.397 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   1.398 +  (exit $ac_status); } && {
   1.399 +	 test -z "$ac_c_werror_flag" ||
   1.400 +	 test ! -s conftest.err
   1.401 +       } && test -s conftest.$ac_objext; then
   1.402 +  ac_cv_header_X11_extensions_Xinerama_h=yes
   1.403 +else
   1.404 +  echo "$as_me: failed program was:" >&5
   1.405 +sed 's/^/| /' conftest.$ac_ext >&5
   1.406 +
   1.407 +	ac_cv_header_X11_extensions_Xinerama_h=no
   1.408 +fi
   1.409 +
   1.410 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   1.411 +fi
   1.412 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5
   1.413 +echo "${ECHO_T}$ac_cv_header_X11_extensions_Xinerama_h" >&6; }
   1.414 +if test $ac_cv_header_X11_extensions_Xinerama_h = yes; then
   1.415 +  have_xinerama_h_hdr=yes
   1.416 +else
   1.417 +  have_xinerama_h_hdr=no
   1.418 +fi
   1.419 +
   1.420 +
   1.421 +                if test x$have_xinerama_h_hdr = xyes; then
   1.422 +                    if test x$enable_x11_shared = xyes && test x$xinerama_lib != x ; then
   1.423 +                        echo "-- dynamic libXinerama -> $xinerama_lib"
   1.424                          cat >>confdefs.h <<_ACEOF
   1.425 -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR "$xrandr_lib"
   1.426 -_ACEOF
   1.427 -
   1.428 -                        definitely_enable_video_x11_xrandr=yes
   1.429 +#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINERAMA "$xinerama_lib"
   1.430 +_ACEOF
   1.431 +
   1.432 +                        definitely_enable_video_x11_xinerama=yes
   1.433                      else
   1.434 -                        { echo "$as_me:$LINENO: checking for XRRQueryExtension in -lXrandr" >&5
   1.435 -echo $ECHO_N "checking for XRRQueryExtension in -lXrandr... $ECHO_C" >&6; }
   1.436 -if test "${ac_cv_lib_Xrandr_XRRQueryExtension+set}" = set; then
   1.437 +                        { echo "$as_me:$LINENO: checking for XineramaQueryExtension in -lXinerama" >&5
   1.438 +echo $ECHO_N "checking for XineramaQueryExtension in -lXinerama... $ECHO_C" >&6; }
   1.439 +if test "${ac_cv_lib_Xinerama_XineramaQueryExtension+set}" = set; then
   1.440    echo $ECHO_N "(cached) $ECHO_C" >&6
   1.441  else
   1.442    ac_check_lib_save_LIBS=$LIBS
   1.443 -LIBS="-lXrandr  $LIBS"
   1.444 -cat >conftest.$ac_ext <<_ACEOF
   1.445 -/* confdefs.h.  */
   1.446 -_ACEOF
   1.447 -cat confdefs.h >>conftest.$ac_ext
   1.448 -cat >>conftest.$ac_ext <<_ACEOF
   1.449 -/* end confdefs.h.  */
   1.450 -
   1.451 -/* Override any GCC internal prototype to avoid an error.
   1.452 -   Use char because int might match the return type of a GCC
   1.453 -   builtin and then its argument prototype would still apply.  */
   1.454 -#ifdef __cplusplus
   1.455 -extern "C"
   1.456 -#endif
   1.457 -char XRRQueryExtension ();
   1.458 -int
   1.459 -main ()
   1.460 -{
   1.461 -return XRRQueryExtension ();
   1.462 -  ;
   1.463 -  return 0;
   1.464 -}
   1.465 -_ACEOF
   1.466 -rm -f conftest.$ac_objext conftest$ac_exeext
   1.467 -if { (ac_try="$ac_link"
   1.468 -case "(($ac_try" in
   1.469 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   1.470 -  *) ac_try_echo=$ac_try;;
   1.471 -esac
   1.472 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   1.473 -  (eval "$ac_link") 2>conftest.er1
   1.474 -  ac_status=$?
   1.475 -  grep -v '^ *+' conftest.er1 >conftest.err
   1.476 -  rm -f conftest.er1
   1.477 -  cat conftest.err >&5
   1.478 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   1.479 -  (exit $ac_status); } && {
   1.480 -	 test -z "$ac_c_werror_flag" ||
   1.481 -	 test ! -s conftest.err
   1.482 -       } && test -s conftest$ac_exeext &&
   1.483 -       $as_test_x conftest$ac_exeext; then
   1.484 -  ac_cv_lib_Xrandr_XRRQueryExtension=yes
   1.485 -else
   1.486 -  echo "$as_me: failed program was:" >&5
   1.487 -sed 's/^/| /' conftest.$ac_ext >&5
   1.488 -
   1.489 -	ac_cv_lib_Xrandr_XRRQueryExtension=no
   1.490 +LIBS="-lXinerama  $LIBS"
   1.491 +cat >conftest.$ac_ext <<_ACEOF
   1.492 +/* confdefs.h.  */
   1.493 +_ACEOF
   1.494 +cat confdefs.h >>conftest.$ac_ext
   1.495 +cat >>conftest.$ac_ext <<_ACEOF
   1.496 +/* end confdefs.h.  */
   1.497 +
   1.498 +/* Override any GCC internal prototype to avoid an error.
   1.499 +   Use char because int might match the return type of a GCC
   1.500 +   builtin and then its argument prototype would still apply.  */
   1.501 +#ifdef __cplusplus
   1.502 +extern "C"
   1.503 +#endif
   1.504 +char XineramaQueryExtension ();
   1.505 +int
   1.506 +main ()
   1.507 +{
   1.508 +return XineramaQueryExtension ();
   1.509 +  ;
   1.510 +  return 0;
   1.511 +}
   1.512 +_ACEOF
   1.513 +rm -f conftest.$ac_objext conftest$ac_exeext
   1.514 +if { (ac_try="$ac_link"
   1.515 +case "(($ac_try" in
   1.516 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   1.517 +  *) ac_try_echo=$ac_try;;
   1.518 +esac
   1.519 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   1.520 +  (eval "$ac_link") 2>conftest.er1
   1.521 +  ac_status=$?
   1.522 +  grep -v '^ *+' conftest.er1 >conftest.err
   1.523 +  rm -f conftest.er1
   1.524 +  cat conftest.err >&5
   1.525 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   1.526 +  (exit $ac_status); } && {
   1.527 +	 test -z "$ac_c_werror_flag" ||
   1.528 +	 test ! -s conftest.err
   1.529 +       } && test -s conftest$ac_exeext &&
   1.530 +       $as_test_x conftest$ac_exeext; then
   1.531 +  ac_cv_lib_Xinerama_XineramaQueryExtension=yes
   1.532 +else
   1.533 +  echo "$as_me: failed program was:" >&5
   1.534 +sed 's/^/| /' conftest.$ac_ext >&5
   1.535 +
   1.536 +	ac_cv_lib_Xinerama_XineramaQueryExtension=no
   1.537  fi
   1.538  
   1.539  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
   1.540        conftest$ac_exeext conftest.$ac_ext
   1.541  LIBS=$ac_check_lib_save_LIBS
   1.542  fi
   1.543 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRQueryExtension" >&5
   1.544 -echo "${ECHO_T}$ac_cv_lib_Xrandr_XRRQueryExtension" >&6; }
   1.545 -if test $ac_cv_lib_Xrandr_XRRQueryExtension = yes; then
   1.546 -  have_xrandr_lib=yes
   1.547 -fi
   1.548 -
   1.549 -                        if test x$have_xrandr_lib = xyes ; then
   1.550 -                            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lXrandr"
   1.551 -                            definitely_enable_video_x11_xrandr=yes
   1.552 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaQueryExtension" >&5
   1.553 +echo "${ECHO_T}$ac_cv_lib_Xinerama_XineramaQueryExtension" >&6; }
   1.554 +if test $ac_cv_lib_Xinerama_XineramaQueryExtension = yes; then
   1.555 +  have_xinerama_lib=yes
   1.556 +fi
   1.557 +
   1.558 +                        if test x$have_xinerama_lib = xyes ; then
   1.559 +                            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lXinerama"
   1.560 +                            definitely_enable_video_x11_xinerama=yes
   1.561                          fi
   1.562                      fi
   1.563                  fi
   1.564              fi
   1.565 -            if test x$definitely_enable_video_x11_xrandr = xyes; then
   1.566 +            if test x$definitely_enable_video_x11_xinerama = xyes; then
   1.567                  cat >>confdefs.h <<\_ACEOF
   1.568 -#define SDL_VIDEO_DRIVER_X11_XRANDR 1
   1.569 +#define SDL_VIDEO_DRIVER_X11_XINERAMA 1
   1.570  _ACEOF
   1.571  
   1.572              fi
   1.573 @@ -24565,6 +24455,154 @@
   1.574  _ACEOF
   1.575  
   1.576              fi
   1.577 +            # Check whether --enable-video-x11-xrandr was given.
   1.578 +if test "${enable_video_x11_xrandr+set}" = set; then
   1.579 +  enableval=$enable_video_x11_xrandr;
   1.580 +else
   1.581 +  enable_video_x11_xrandr=yes
   1.582 +fi
   1.583 +
   1.584 +            if test x$enable_video_x11_xrandr = xyes; then
   1.585 +                definitely_enable_video_x11_xrandr=no
   1.586 +                { echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5
   1.587 +echo $ECHO_N "checking for X11/extensions/Xrandr.h... $ECHO_C" >&6; }
   1.588 +if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then
   1.589 +  echo $ECHO_N "(cached) $ECHO_C" >&6
   1.590 +else
   1.591 +  cat >conftest.$ac_ext <<_ACEOF
   1.592 +/* confdefs.h.  */
   1.593 +_ACEOF
   1.594 +cat confdefs.h >>conftest.$ac_ext
   1.595 +cat >>conftest.$ac_ext <<_ACEOF
   1.596 +/* end confdefs.h.  */
   1.597 +#include <X11/Xlib.h>
   1.598 +
   1.599 +
   1.600 +#include <X11/extensions/Xrandr.h>
   1.601 +_ACEOF
   1.602 +rm -f conftest.$ac_objext
   1.603 +if { (ac_try="$ac_compile"
   1.604 +case "(($ac_try" in
   1.605 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   1.606 +  *) ac_try_echo=$ac_try;;
   1.607 +esac
   1.608 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   1.609 +  (eval "$ac_compile") 2>conftest.er1
   1.610 +  ac_status=$?
   1.611 +  grep -v '^ *+' conftest.er1 >conftest.err
   1.612 +  rm -f conftest.er1
   1.613 +  cat conftest.err >&5
   1.614 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   1.615 +  (exit $ac_status); } && {
   1.616 +	 test -z "$ac_c_werror_flag" ||
   1.617 +	 test ! -s conftest.err
   1.618 +       } && test -s conftest.$ac_objext; then
   1.619 +  ac_cv_header_X11_extensions_Xrandr_h=yes
   1.620 +else
   1.621 +  echo "$as_me: failed program was:" >&5
   1.622 +sed 's/^/| /' conftest.$ac_ext >&5
   1.623 +
   1.624 +	ac_cv_header_X11_extensions_Xrandr_h=no
   1.625 +fi
   1.626 +
   1.627 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   1.628 +fi
   1.629 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5
   1.630 +echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrandr_h" >&6; }
   1.631 +if test $ac_cv_header_X11_extensions_Xrandr_h = yes; then
   1.632 +  have_xrandr_h_hdr=yes
   1.633 +else
   1.634 +  have_xrandr_h_hdr=no
   1.635 +fi
   1.636 +
   1.637 +
   1.638 +                if test x$have_xrandr_h_hdr = xyes; then
   1.639 +                    if test x$enable_x11_shared = xyes && test x$xrandr_lib != x ; then
   1.640 +                        echo "-- dynamic libXrandr -> $xrandr_lib"
   1.641 +                        cat >>confdefs.h <<_ACEOF
   1.642 +#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR "$xrandr_lib"
   1.643 +_ACEOF
   1.644 +
   1.645 +                        definitely_enable_video_x11_xrandr=yes
   1.646 +                    else
   1.647 +                        { echo "$as_me:$LINENO: checking for XRRQueryExtension in -lXrandr" >&5
   1.648 +echo $ECHO_N "checking for XRRQueryExtension in -lXrandr... $ECHO_C" >&6; }
   1.649 +if test "${ac_cv_lib_Xrandr_XRRQueryExtension+set}" = set; then
   1.650 +  echo $ECHO_N "(cached) $ECHO_C" >&6
   1.651 +else
   1.652 +  ac_check_lib_save_LIBS=$LIBS
   1.653 +LIBS="-lXrandr  $LIBS"
   1.654 +cat >conftest.$ac_ext <<_ACEOF
   1.655 +/* confdefs.h.  */
   1.656 +_ACEOF
   1.657 +cat confdefs.h >>conftest.$ac_ext
   1.658 +cat >>conftest.$ac_ext <<_ACEOF
   1.659 +/* end confdefs.h.  */
   1.660 +
   1.661 +/* Override any GCC internal prototype to avoid an error.
   1.662 +   Use char because int might match the return type of a GCC
   1.663 +   builtin and then its argument prototype would still apply.  */
   1.664 +#ifdef __cplusplus
   1.665 +extern "C"
   1.666 +#endif
   1.667 +char XRRQueryExtension ();
   1.668 +int
   1.669 +main ()
   1.670 +{
   1.671 +return XRRQueryExtension ();
   1.672 +  ;
   1.673 +  return 0;
   1.674 +}
   1.675 +_ACEOF
   1.676 +rm -f conftest.$ac_objext conftest$ac_exeext
   1.677 +if { (ac_try="$ac_link"
   1.678 +case "(($ac_try" in
   1.679 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   1.680 +  *) ac_try_echo=$ac_try;;
   1.681 +esac
   1.682 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   1.683 +  (eval "$ac_link") 2>conftest.er1
   1.684 +  ac_status=$?
   1.685 +  grep -v '^ *+' conftest.er1 >conftest.err
   1.686 +  rm -f conftest.er1
   1.687 +  cat conftest.err >&5
   1.688 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   1.689 +  (exit $ac_status); } && {
   1.690 +	 test -z "$ac_c_werror_flag" ||
   1.691 +	 test ! -s conftest.err
   1.692 +       } && test -s conftest$ac_exeext &&
   1.693 +       $as_test_x conftest$ac_exeext; then
   1.694 +  ac_cv_lib_Xrandr_XRRQueryExtension=yes
   1.695 +else
   1.696 +  echo "$as_me: failed program was:" >&5
   1.697 +sed 's/^/| /' conftest.$ac_ext >&5
   1.698 +
   1.699 +	ac_cv_lib_Xrandr_XRRQueryExtension=no
   1.700 +fi
   1.701 +
   1.702 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
   1.703 +      conftest$ac_exeext conftest.$ac_ext
   1.704 +LIBS=$ac_check_lib_save_LIBS
   1.705 +fi
   1.706 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRQueryExtension" >&5
   1.707 +echo "${ECHO_T}$ac_cv_lib_Xrandr_XRRQueryExtension" >&6; }
   1.708 +if test $ac_cv_lib_Xrandr_XRRQueryExtension = yes; then
   1.709 +  have_xrandr_lib=yes
   1.710 +fi
   1.711 +
   1.712 +                        if test x$have_xrandr_lib = xyes ; then
   1.713 +                            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lXrandr"
   1.714 +                            definitely_enable_video_x11_xrandr=yes
   1.715 +                        fi
   1.716 +                    fi
   1.717 +                fi
   1.718 +            fi
   1.719 +            if test x$definitely_enable_video_x11_xrandr = xyes; then
   1.720 +                cat >>confdefs.h <<\_ACEOF
   1.721 +#define SDL_VIDEO_DRIVER_X11_XRANDR 1
   1.722 +_ACEOF
   1.723 +
   1.724 +            fi
   1.725              # Check whether --enable-video-x11-scrnsaver was given.
   1.726  if test "${enable_video_x11_scrnsaver+set}" = set; then
   1.727    enableval=$enable_video_x11_scrnsaver;
   1.728 @@ -24708,7 +24746,222 @@
   1.729              fi
   1.730              if test x$definitely_enable_video_x11_scrnsaver = xyes; then
   1.731                  cat >>confdefs.h <<\_ACEOF
   1.732 -#define SDL_VIDEO_DRIVER_X11_SCRNSAVER 1
   1.733 +#define SDL_VIDEO_DRIVER_X11_XSCRNSAVER 1
   1.734 +_ACEOF
   1.735 +
   1.736 +            fi
   1.737 +            # Check whether --enable-video-x11-xshape was given.
   1.738 +if test "${enable_video_x11_xshape+set}" = set; then
   1.739 +  enableval=$enable_video_x11_xshape;
   1.740 +else
   1.741 +  enable_video_x11_xshape=yes
   1.742 +fi
   1.743 +
   1.744 +            if test x$enable_video_x11_xshape = xyes; then
   1.745 +                { echo "$as_me:$LINENO: checking for X11/extensions/shape.h" >&5
   1.746 +echo $ECHO_N "checking for X11/extensions/shape.h... $ECHO_C" >&6; }
   1.747 +if test "${ac_cv_header_X11_extensions_shape_h+set}" = set; then
   1.748 +  echo $ECHO_N "(cached) $ECHO_C" >&6
   1.749 +else
   1.750 +  cat >conftest.$ac_ext <<_ACEOF
   1.751 +/* confdefs.h.  */
   1.752 +_ACEOF
   1.753 +cat confdefs.h >>conftest.$ac_ext
   1.754 +cat >>conftest.$ac_ext <<_ACEOF
   1.755 +/* end confdefs.h.  */
   1.756 +#include <X11/Xlib.h>
   1.757 +
   1.758 +
   1.759 +#include <X11/extensions/shape.h>
   1.760 +_ACEOF
   1.761 +rm -f conftest.$ac_objext
   1.762 +if { (ac_try="$ac_compile"
   1.763 +case "(($ac_try" in
   1.764 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   1.765 +  *) ac_try_echo=$ac_try;;
   1.766 +esac
   1.767 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   1.768 +  (eval "$ac_compile") 2>conftest.er1
   1.769 +  ac_status=$?
   1.770 +  grep -v '^ *+' conftest.er1 >conftest.err
   1.771 +  rm -f conftest.er1
   1.772 +  cat conftest.err >&5
   1.773 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   1.774 +  (exit $ac_status); } && {
   1.775 +	 test -z "$ac_c_werror_flag" ||
   1.776 +	 test ! -s conftest.err
   1.777 +       } && test -s conftest.$ac_objext; then
   1.778 +  ac_cv_header_X11_extensions_shape_h=yes
   1.779 +else
   1.780 +  echo "$as_me: failed program was:" >&5
   1.781 +sed 's/^/| /' conftest.$ac_ext >&5
   1.782 +
   1.783 +	ac_cv_header_X11_extensions_shape_h=no
   1.784 +fi
   1.785 +
   1.786 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   1.787 +fi
   1.788 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_shape_h" >&5
   1.789 +echo "${ECHO_T}$ac_cv_header_X11_extensions_shape_h" >&6; }
   1.790 +if test $ac_cv_header_X11_extensions_shape_h = yes; then
   1.791 +  have_shape_h_hdr=yes
   1.792 +else
   1.793 +  have_shape_h_hdr=no
   1.794 +fi
   1.795 +
   1.796 +
   1.797 +                if test x$have_shape_h_hdr = xyes; then
   1.798 +                    cat >>confdefs.h <<\_ACEOF
   1.799 +#define SDL_VIDEO_DRIVER_X11_XSHAPE 1
   1.800 +_ACEOF
   1.801 +
   1.802 +                fi
   1.803 +            fi
   1.804 +            # Check whether --enable-video-x11-vm was given.
   1.805 +if test "${enable_video_x11_vm+set}" = set; then
   1.806 +  enableval=$enable_video_x11_vm;
   1.807 +else
   1.808 +  enable_video_x11_vm=yes
   1.809 +fi
   1.810 +
   1.811 +            if test x$enable_video_x11_vm = xyes; then
   1.812 +                definitely_enable_video_x11_vm=no
   1.813 +                { echo "$as_me:$LINENO: checking for X11/extensions/xf86vmode.h" >&5
   1.814 +echo $ECHO_N "checking for X11/extensions/xf86vmode.h... $ECHO_C" >&6; }
   1.815 +if test "${ac_cv_header_X11_extensions_xf86vmode_h+set}" = set; then
   1.816 +  echo $ECHO_N "(cached) $ECHO_C" >&6
   1.817 +else
   1.818 +  cat >conftest.$ac_ext <<_ACEOF
   1.819 +/* confdefs.h.  */
   1.820 +_ACEOF
   1.821 +cat confdefs.h >>conftest.$ac_ext
   1.822 +cat >>conftest.$ac_ext <<_ACEOF
   1.823 +/* end confdefs.h.  */
   1.824 +#include <X11/Xlib.h>
   1.825 +
   1.826 +
   1.827 +#include <X11/extensions/xf86vmode.h>
   1.828 +_ACEOF
   1.829 +rm -f conftest.$ac_objext
   1.830 +if { (ac_try="$ac_compile"
   1.831 +case "(($ac_try" in
   1.832 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   1.833 +  *) ac_try_echo=$ac_try;;
   1.834 +esac
   1.835 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   1.836 +  (eval "$ac_compile") 2>conftest.er1
   1.837 +  ac_status=$?
   1.838 +  grep -v '^ *+' conftest.er1 >conftest.err
   1.839 +  rm -f conftest.er1
   1.840 +  cat conftest.err >&5
   1.841 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   1.842 +  (exit $ac_status); } && {
   1.843 +	 test -z "$ac_c_werror_flag" ||
   1.844 +	 test ! -s conftest.err
   1.845 +       } && test -s conftest.$ac_objext; then
   1.846 +  ac_cv_header_X11_extensions_xf86vmode_h=yes
   1.847 +else
   1.848 +  echo "$as_me: failed program was:" >&5
   1.849 +sed 's/^/| /' conftest.$ac_ext >&5
   1.850 +
   1.851 +	ac_cv_header_X11_extensions_xf86vmode_h=no
   1.852 +fi
   1.853 +
   1.854 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   1.855 +fi
   1.856 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xf86vmode_h" >&5
   1.857 +echo "${ECHO_T}$ac_cv_header_X11_extensions_xf86vmode_h" >&6; }
   1.858 +if test $ac_cv_header_X11_extensions_xf86vmode_h = yes; then
   1.859 +  have_vm_h_hdr=yes
   1.860 +else
   1.861 +  have_vm_h_hdr=no
   1.862 +fi
   1.863 +
   1.864 +
   1.865 +                if test x$have_vm_h_hdr = xyes; then
   1.866 +                    if test x$enable_x11_shared = xyes && test x$xvidmode_lib != x ; then
   1.867 +                        echo "-- dynamic libXxf86vm -> $xvidmode_lib"
   1.868 +                        cat >>confdefs.h <<_ACEOF
   1.869 +#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XVIDMODE "$xvidmode_lib"
   1.870 +_ACEOF
   1.871 +
   1.872 +                        definitely_enable_video_x11_vm=yes
   1.873 +                    else
   1.874 +                        { echo "$as_me:$LINENO: checking for XF86VidModeQueryVersion in -lXxf86vm" >&5
   1.875 +echo $ECHO_N "checking for XF86VidModeQueryVersion in -lXxf86vm... $ECHO_C" >&6; }
   1.876 +if test "${ac_cv_lib_Xxf86vm_XF86VidModeQueryVersion+set}" = set; then
   1.877 +  echo $ECHO_N "(cached) $ECHO_C" >&6
   1.878 +else
   1.879 +  ac_check_lib_save_LIBS=$LIBS
   1.880 +LIBS="-lXxf86vm  $LIBS"
   1.881 +cat >conftest.$ac_ext <<_ACEOF
   1.882 +/* confdefs.h.  */
   1.883 +_ACEOF
   1.884 +cat confdefs.h >>conftest.$ac_ext
   1.885 +cat >>conftest.$ac_ext <<_ACEOF
   1.886 +/* end confdefs.h.  */
   1.887 +
   1.888 +/* Override any GCC internal prototype to avoid an error.
   1.889 +   Use char because int might match the return type of a GCC
   1.890 +   builtin and then its argument prototype would still apply.  */
   1.891 +#ifdef __cplusplus
   1.892 +extern "C"
   1.893 +#endif
   1.894 +char XF86VidModeQueryVersion ();
   1.895 +int
   1.896 +main ()
   1.897 +{
   1.898 +return XF86VidModeQueryVersion ();
   1.899 +  ;
   1.900 +  return 0;
   1.901 +}
   1.902 +_ACEOF
   1.903 +rm -f conftest.$ac_objext conftest$ac_exeext
   1.904 +if { (ac_try="$ac_link"
   1.905 +case "(($ac_try" in
   1.906 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   1.907 +  *) ac_try_echo=$ac_try;;
   1.908 +esac
   1.909 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   1.910 +  (eval "$ac_link") 2>conftest.er1
   1.911 +  ac_status=$?
   1.912 +  grep -v '^ *+' conftest.er1 >conftest.err
   1.913 +  rm -f conftest.er1
   1.914 +  cat conftest.err >&5
   1.915 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   1.916 +  (exit $ac_status); } && {
   1.917 +	 test -z "$ac_c_werror_flag" ||
   1.918 +	 test ! -s conftest.err
   1.919 +       } && test -s conftest$ac_exeext &&
   1.920 +       $as_test_x conftest$ac_exeext; then
   1.921 +  ac_cv_lib_Xxf86vm_XF86VidModeQueryVersion=yes
   1.922 +else
   1.923 +  echo "$as_me: failed program was:" >&5
   1.924 +sed 's/^/| /' conftest.$ac_ext >&5
   1.925 +
   1.926 +	ac_cv_lib_Xxf86vm_XF86VidModeQueryVersion=no
   1.927 +fi
   1.928 +
   1.929 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
   1.930 +      conftest$ac_exeext conftest.$ac_ext
   1.931 +LIBS=$ac_check_lib_save_LIBS
   1.932 +fi
   1.933 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86vm_XF86VidModeQueryVersion" >&5
   1.934 +echo "${ECHO_T}$ac_cv_lib_Xxf86vm_XF86VidModeQueryVersion" >&6; }
   1.935 +if test $ac_cv_lib_Xxf86vm_XF86VidModeQueryVersion = yes; then
   1.936 +  have_vm_lib=yes
   1.937 +fi
   1.938 +
   1.939 +                        if test x$have_vm_lib = xyes ; then
   1.940 +                            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lXxf86vm"
   1.941 +                            definitely_enable_video_x11_vm=yes
   1.942 +                        fi
   1.943 +                    fi
   1.944 +                fi
   1.945 +            fi
   1.946 +            if test x$definitely_enable_video_x11_vm = xyes; then
   1.947 +                cat >>confdefs.h <<\_ACEOF
   1.948 +#define SDL_VIDEO_DRIVER_X11_XVIDMODE 1
   1.949  _ACEOF
   1.950  
   1.951              fi