--- rxvt-unicode/configure	2007/11/11 04:08:00	1.116
+++ rxvt-unicode/configure	2007/11/18 01:31:38	1.118
@@ -1922,6 +1922,7 @@
 
 VERSION=`sed -n -e 's/^.*[ \t]VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
 DATE=`sed -n -e 's/^.*[ \t]DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
+
 echo ""
 echo "configuring for rxvt $VERSION"
 echo ""
@@ -4893,6 +4894,7 @@
 
 
 
+LIBEV_M4_AVOID_LIBRT=1
 
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -5367,7 +5369,8 @@
 
 
 
-for ac_header in sys/epoll.h sys/event.h sys/queue.h
+
+for ac_header in sys/epoll.h sys/event.h sys/queue.h port.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
@@ -5509,7 +5512,8 @@
 
 
 
-for ac_func in epoll_ctl kqueue
+
+for ac_func in epoll_ctl kqueue port_create
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 { echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -5688,6 +5692,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; }
@@ -5853,6 +5858,7 @@
 fi
 done
 
+   fi
 
 fi
 
@@ -12973,7 +12979,7 @@
 
 
   if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then
-    LIBS="$LIBS `$PKG_CONFIG xft --libs`"
+    X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS"
     CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"
   else
     # Extract the first word of "xft-config", so it can be a program name with args.
@@ -13018,11 +13024,13 @@
 
 
     if test $XFT_CONFIG != no; then
-      LIBS="$LIBS `$XFT_CONFIG --libs`"
+      X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
       CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
     fi
   fi
 
+  save_LIBS="$LIBS"
+  LIBS="$LIBS $X_LIBS"
 
 for ac_header in X11/Xft/Xft.h
 do
@@ -13165,8 +13173,7 @@
 
 done
 
-
-{ 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
@@ -13228,16 +13235,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="$save_LIBS"
 
   if test x$support_xft = xyes; then