--- rxvt-unicode/configure.ac	2006/01/21 23:07:38	1.19
+++ rxvt-unicode/configure.ac	2006/01/22 17:00:42	1.22
@@ -715,7 +715,6 @@
 	setresuid \
 	setreuid \
 	on_exit \
-	nanosleep \
 )
 
 UTMP_CHECK
@@ -808,11 +807,11 @@
 dnl# --------------------------------------------------------------------------
 if test x$support_xft = xyes; then
   AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-  AC_PATH_PROG(XFT_CONFIG, xft-config, no)
   if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then
     LIBS="$LIBS `$PKG_CONFIG xft --libs`"
     CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"
   else
+    AC_PATH_PROG(XFT_CONFIG, xft-config, no)
     if test $XFT_CONFIG != no; then
       LIBS="$LIBS `$XFT_CONFIG --libs`"
       CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
@@ -1053,22 +1052,17 @@
   echo "  Xpm library:                $XPM_LIBS"
 fi
 
-echo "
-The following are set in config.h
-"
 if test x$support_utmp != xyes; then
   echo "  utmp support:               disabled"
   echo
 else
   echo "  utmp support:               enabled
-  utmp file:                  $rxvt_cv_path_utmp
-  utmpx file:                 $rxvt_cv_path_utmpx
-  wtmp file:                  $rxvt_cv_path_wtmp
-  wtmpx file:                 $rxvt_cv_path_wtmpx
-  lastlog file:               $rxvt_cv_path_lastlog
-  ttys/ttytab file:           $rxvt_cv_path_ttytab
-  embedded perl:              $support_perl"
-  echo
+  utmp file:                  $path_utmp
+  utmpx file:                 $path_utmpx
+  wtmp file:                  $path_wtmp
+  wtmpx file:                 $path_wtmpx
+  lastlog file:               $path_lastlog
+  lastlogx file:              $path_lastlogx"
 fi
 if test x$term != x; then
   echo "  set TERM to:                $term"
@@ -1082,6 +1076,8 @@
    echo "  resource class fallback:    $RESFALLBACK"
 fi
 echo
+echo "  embedded perl:              $support_perl"
+echo
 if test x$support_xpm = xneedsmanualspecification; then
   echo ".----------------------------------------------------------------."
   echo ". WARNING: --enable-xpm-background was specified however the     ."