1.1 --- a/configure	Fri Jun 01 20:05:38 2012 -0400
     1.2 +++ b/configure	Fri Jun 01 20:06:48 2012 -0400
     1.3 @@ -22181,17 +22181,12 @@
     1.4                #include <X11/extensions/Xext.h>
     1.5                #include <X11/extensions/extutil.h>
     1.6  
     1.7 +int
     1.8 +main ()
     1.9 +{
    1.10 +
    1.11  extern XExtDisplayInfo* XextAddDisplay(XExtensionInfo* a,Display* b,_Xconst char* c,XExtensionHooks* d,int e,XPointer f);
    1.12 -
    1.13 -int
    1.14 -main ()
    1.15 -{
    1.16 -
    1.17  XExtDisplayInfo*
    1.18 -XextAddDisplay(XExtensionInfo* a,Display* b,_Xconst char* c,XExtensionHooks* d,int e,XPointer f)
    1.19 -{
    1.20 -    return (XExtDisplayInfo*)0;
    1.21 -}
    1.22  
    1.23    ;
    1.24    return 0;
    1.25 @@ -22301,6 +22296,75 @@
    1.26  
    1.27  fi
    1.28  
    1.29 +            { echo "$as_me:$LINENO: checking for XkbKeycodeToKeysym in -lX11" >&5
    1.30 +echo $ECHO_N "checking for XkbKeycodeToKeysym in -lX11... $ECHO_C" >&6; }
    1.31 +if test "${ac_cv_lib_X11_XkbKeycodeToKeysym+set}" = set; then
    1.32 +  echo $ECHO_N "(cached) $ECHO_C" >&6
    1.33 +else
    1.34 +  ac_check_lib_save_LIBS=$LIBS
    1.35 +LIBS="-lX11  $LIBS"
    1.36 +cat >conftest.$ac_ext <<_ACEOF
    1.37 +/* confdefs.h.  */
    1.38 +_ACEOF
    1.39 +cat confdefs.h >>conftest.$ac_ext
    1.40 +cat >>conftest.$ac_ext <<_ACEOF
    1.41 +/* end confdefs.h.  */
    1.42 +
    1.43 +/* Override any GCC internal prototype to avoid an error.
    1.44 +   Use char because int might match the return type of a GCC
    1.45 +   builtin and then its argument prototype would still apply.  */
    1.46 +#ifdef __cplusplus
    1.47 +extern "C"
    1.48 +#endif
    1.49 +char XkbKeycodeToKeysym ();
    1.50 +int
    1.51 +main ()
    1.52 +{
    1.53 +return XkbKeycodeToKeysym ();
    1.54 +  ;
    1.55 +  return 0;
    1.56 +}
    1.57 +_ACEOF
    1.58 +rm -f conftest.$ac_objext conftest$ac_exeext
    1.59 +if { (ac_try="$ac_link"
    1.60 +case "(($ac_try" in
    1.61 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    1.62 +  *) ac_try_echo=$ac_try;;
    1.63 +esac
    1.64 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    1.65 +  (eval "$ac_link") 2>conftest.er1
    1.66 +  ac_status=$?
    1.67 +  grep -v '^ *+' conftest.er1 >conftest.err
    1.68 +  rm -f conftest.er1
    1.69 +  cat conftest.err >&5
    1.70 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    1.71 +  (exit $ac_status); } && {
    1.72 +	 test -z "$ac_c_werror_flag" ||
    1.73 +	 test ! -s conftest.err
    1.74 +       } && test -s conftest$ac_exeext &&
    1.75 +       $as_test_x conftest$ac_exeext; then
    1.76 +  ac_cv_lib_X11_XkbKeycodeToKeysym=yes
    1.77 +else
    1.78 +  echo "$as_me: failed program was:" >&5
    1.79 +sed 's/^/| /' conftest.$ac_ext >&5
    1.80 +
    1.81 +	ac_cv_lib_X11_XkbKeycodeToKeysym=no
    1.82 +fi
    1.83 +
    1.84 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
    1.85 +      conftest$ac_exeext conftest.$ac_ext
    1.86 +LIBS=$ac_check_lib_save_LIBS
    1.87 +fi
    1.88 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XkbKeycodeToKeysym" >&5
    1.89 +echo "${ECHO_T}$ac_cv_lib_X11_XkbKeycodeToKeysym" >&6; }
    1.90 +if test $ac_cv_lib_X11_XkbKeycodeToKeysym = yes; then
    1.91 +
    1.92 +cat >>confdefs.h <<\_ACEOF
    1.93 +#define SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM 1
    1.94 +_ACEOF
    1.95 +
    1.96 +fi
    1.97 +
    1.98  
    1.99              # Check whether --enable-video-x11-xcursor was given.
   1.100  if test "${enable_video_x11_xcursor+set}" = set; then

     2.1 --- a/configure.in	Fri Jun 01 20:05:38 2012 -0400
     2.2 +++ b/configure.in	Fri Jun 01 20:06:48 2012 -0400
     2.3 @@ -1101,10 +1101,6 @@
     2.4              ],[
     2.5  extern XExtDisplayInfo* XextAddDisplay(XExtensionInfo* a,Display* b,_Xconst char* c,XExtensionHooks* d,int e,XPointer f);
     2.6  XExtDisplayInfo*
     2.7 -XextAddDisplay(XExtensionInfo* a,Display* b,_Xconst char* c,XExtensionHooks* d,int e,XPointer f)
     2.8 -{
     2.9 -    return (XExtDisplayInfo*)0;
    2.10 -}
    2.11              ],[
    2.12              have_const_param_XextAddDisplay=yes
    2.13              AC_DEFINE(SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY)