--- rxvt-unicode/configure.ac	2011/01/04 10:01:53	1.125
+++ rxvt-unicode/configure.ac	2011/01/05 17:41:24	1.128
@@ -519,12 +519,6 @@
 	cwchar \
 )
 
-AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
-[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])])
-if test x$rxvt_cv_xpointer = xyes; then
-  AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
-fi
-
 AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access,
 [AC_COMPILE_IFELSE(
    [AC_LANG_PROGRAM([
@@ -573,7 +567,7 @@
   AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
   [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
   #include <stdlib.h>
-  main() {
+  int main() {
   char *p;
   if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
   exit (XSupportsLocale() ? 0 : 1);
@@ -584,7 +578,7 @@
   if test x$rxvt_cv_func_xlocale = xyes; then
     AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input)
     AC_CACHE_CHECK(for broken XIM callback, rxvt_cv_broken_ximcb,
-    [AC_COMPILE_IFELSE([
+    [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
     #include <X11/Xlib.h>
 
     void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3);
@@ -593,7 +587,7 @@
       XIMCallback cb;
       cb.callback = im_destroy_cb;
     }
-    ],rxvt_cv_broken_ximcb=yes,rxvt_cv_broken_ximcb=no)])
+    ]])],rxvt_cv_broken_ximcb=yes,rxvt_cv_broken_ximcb=no)])
 
     if test x$rxvt_cv_broken_ximcb = xyes; then
        AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)