--- rxvt-unicode/configure	2007/11/18 01:02:09	1.117
+++ rxvt-unicode/configure	2007/11/26 20:07:49	1.120
@@ -3873,7 +3873,7 @@
 
 if test -z "$orig_CXXFLAGS"; then
   if test x$GCC = xyes && test "x$GXX" = xyes; then
-    CXXFLAGS="-g -O3 -fno-threadsafe-statics -fno-enforce-eh-specs"
+    CXXFLAGS="-g -O3 -fno-rtti -fvisibility-inlines-hidden -fno-threadsafe-statics -fno-enforce-eh-specs"
     cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4894,6 +4894,7 @@
 
 
 
+LIBEV_M4_AVOID_LIBRT=1
 
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -5369,7 +5370,9 @@
 
 
 
-for ac_header in sys/epoll.h sys/event.h sys/queue.h port.h
+
+
+for ac_header in sys/epoll.h sys/event.h sys/queue.h port.h poll.h sys/select.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -5512,7 +5515,9 @@
 
 
 
-for ac_func in epoll_ctl kqueue port_create
+
+
+for ac_func in epoll_ctl kqueue port_create poll select
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 { echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -5691,6 +5696,7 @@
   :
 else
 
+   if test -z "$LIBEV_M4_AVOID_LIBRT"; then
 
 { echo "$as_me:$LINENO: checking for clock_gettime in -lrt" >&5
 echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6; }
@@ -5856,6 +5862,7 @@
 fi
 done
 
+   fi
 
 fi
 
@@ -13026,6 +13033,8 @@
     fi
   fi
 
+  save_LIBS="$LIBS"
+  LIBS="$LIBS $X_LIBS"
 
 for ac_header in X11/Xft/Xft.h
 do
@@ -13168,10 +13177,7 @@
 
 done
 
-  ac_save_LIBS="$LIBS"
-  LIBS="$LIBS $X_LIBS"
-
-{ echo "$as_me:$LINENO: checking for XftDrawString32 in -lXft" >&5
+  { echo "$as_me:$LINENO: checking for XftDrawString32 in -lXft" >&5
 echo $ECHO_N "checking for XftDrawString32 in -lXft... $ECHO_C" >&6; }
 if test "${ac_cv_lib_Xft_XftDrawString32+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13233,17 +13239,12 @@
 { echo "$as_me:$LINENO: result: $ac_cv_lib_Xft_XftDrawString32" >&5
 echo "${ECHO_T}$ac_cv_lib_Xft_XftDrawString32" >&6; }
 if test $ac_cv_lib_Xft_XftDrawString32 = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBXFT 1
-_ACEOF
-
-  LIBS="-lXft $LIBS"
-
+  :
 else
   support_xft=no
 fi
 
-  LIBS="$ac_save_LIBS"
+  LIBS="$save_LIBS"
 
   if test x$support_xft = xyes; then