--- rxvt-unicode/configure	2011/01/04 10:03:18	1.142
+++ rxvt-unicode/configure	2011/03/27 00:15:40	1.144
@@ -5295,8 +5295,13 @@
 done
 
 
-ac_fn_cxx_check_func "$LINENO" "clock_gettime" "ac_cv_func_clock_gettime"
+for ac_func in clock_gettime
+do :
+  ac_fn_cxx_check_func "$LINENO" "clock_gettime" "ac_cv_func_clock_gettime"
 if test "x$ac_cv_func_clock_gettime" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_CLOCK_GETTIME 1
+_ACEOF
 
 else
 
@@ -5391,10 +5396,16 @@
    fi
 
 fi
+done
 
 
-ac_fn_cxx_check_func "$LINENO" "nanosleep" "ac_cv_func_nanosleep"
+for ac_func in nanosleep
+do :
+  ac_fn_cxx_check_func "$LINENO" "nanosleep" "ac_cv_func_nanosleep"
 if test "x$ac_cv_func_nanosleep" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_NANOSLEEP 1
+_ACEOF
 
 else
 
@@ -5459,15 +5470,18 @@
    fi
 
 fi
+done
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ceil in -lm" >&5
-$as_echo_n "checking for ceil in -lm... " >&6; }
-if test "${ac_cv_lib_m_ceil+set}" = set; then :
+if test -z "$LIBEV_M4_AVOID_LIBM"; then
+   LIBM=m
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing floor" >&5
+$as_echo_n "checking for library containing floor... " >&6; }
+if test "${ac_cv_search_floor+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm  $LIBS"
+  ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -5477,32 +5491,46 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char ceil ();
+char floor ();
 int
 main ()
 {
-return ceil ();
+return floor ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_lib_m_ceil=yes
-else
-  ac_cv_lib_m_ceil=no
+for ac_lib in '' $LIBM; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_search_floor=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+    conftest$ac_exeext
+  if test "${ac_cv_search_floor+set}" = set; then :
+  break
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_ceil" >&5
-$as_echo "$ac_cv_lib_m_ceil" >&6; }
-if test "x$ac_cv_lib_m_ceil" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBM 1
-_ACEOF
+done
+if test "${ac_cv_search_floor+set}" = set; then :
 
-  LIBS="-lm $LIBS"
+else
+  ac_cv_search_floor=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_floor" >&5
+$as_echo "$ac_cv_search_floor" >&6; }
+ac_res=$ac_cv_search_floor
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+$as_echo "#define HAVE_FLOOR 1" >>confdefs.h
 
 fi
 
@@ -6422,37 +6450,6 @@
 done
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XPointer" >&5
-$as_echo_n "checking for XPointer... " >&6; }
-if test "${rxvt_cv_xpointer+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <X11/Xlib.h>
-int
-main ()
-{
-XPointer dummy;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  rxvt_cv_xpointer=yes
-else
-  rxvt_cv_xpointer=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $rxvt_cv_xpointer" >&5
-$as_echo "$rxvt_cv_xpointer" >&6; }
-if test x$rxvt_cv_xpointer = xyes; then
-
-$as_echo "#define HAVE_XPOINTER 1" >>confdefs.h
-
-fi
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XLIB_ILLEGAL_ACCESS" >&5
 $as_echo_n "checking for XLIB_ILLEGAL_ACCESS... " >&6; }
 if test "${rxvt_cv_xlib_illegal_access+set}" = set; then :
@@ -6986,7 +6983,7 @@
 #include <sys/types.h>
 #include <utmp.h>
 #include <errno.h>
-main()
+int main()
 {
     char **u, *utmplist[] = {
     "/var/run/utmp", "/var/adm/utmp", "/etc/utmp", "/usr/etc/utmp", "/usr/adm/utmp", NULL };
@@ -7048,7 +7045,7 @@
 #include <utmp.h>
 #endif
 #include <errno.h>
-main()
+int main()
 {
     char **w, *wtmplist[] = {
     "/var/log/wtmp", "/var/adm/wtmp", "/etc/wtmp", "/usr/etc/wtmp", "/usr/adm/wtmp", NULL };
@@ -7108,7 +7105,7 @@
 #include <utmpx.h>
 #endif
 #include <errno.h>
-main()
+int main()
 {
     char **w, *wtmplist[] = {
     "/var/log/wtmpx", "/var/adm/wtmpx", NULL };
@@ -7174,7 +7171,7 @@
 #include <lastlog.h>
 #endif
 #include <errno.h>
-main()
+int main()
 {
     char **w, *lastloglist[] = { "/var/log/lastlog", NULL };
     FILE *a, *f=fopen("conftestval", "w");
@@ -7233,7 +7230,7 @@
 #include <utmpx.h>
 #endif
 #include <errno.h>
-main()
+int main()
 {
     char **w, *wtmplist[] = { "/var/log/lastlogx", "/var/adm/lastlogx", NULL };
     FILE *a, *f=fopen("conftestval", "w");
@@ -7289,21 +7286,24 @@
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
-      :
+  :
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <X11/Xlib.h>
+
+  #include <X11/Xlib.h>
   #include <stdlib.h>
-  main() {
-  char *p;
-  if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
-  exit (XSupportsLocale() ? 0 : 1);
-  else
-  exit (1);}
+  int main() {
+    char *p;
+    if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
+      exit (XSupportsLocale() ? 0 : 1);
+    else
+      exit (1);
+  }
+
 _ACEOF
 if ac_fn_cxx_try_run "$LINENO"; then :
-      rxvt_cv_func_xlocale=yes
+  rxvt_cv_func_xlocale=yes
 else
   rxvt_cv_func_xlocale=no
 fi
@@ -7714,7 +7714,7 @@
 #include <unistd.h>
 #include <grp.h>
 
-main()
+int main()
 {
   struct stat st;
   struct group *gr;