--- rxvt-unicode/configure.ac	2006/01/22 04:09:17	1.20
+++ rxvt-unicode/configure.ac	2006/01/22 20:39:47	1.24
@@ -65,7 +65,7 @@
 dnl#
 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-threadsafe-statics -fno-enforce-eh-specs"
     AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [], [CXXFLAGS="-g -O3"])
   else
     CXXFLAGS="-O"
@@ -327,12 +327,6 @@
     support_xim=$enableval
   fi])
 
-AC_ARG_ENABLE(ttygid,
-  [  --enable-ttygid         enable tty setting to group named "tty"],
-  [if test x$enableval = xyes; then
-    AC_DEFINE(TTY_GID_SUPPORT, 1, Define to change gid of ttys to group tty)
-  fi])
-
 AC_ARG_ENABLE(backspace-key,
   [  --disable-backspace-key disable handling of the backspace key],
   [if test x$enableval = xno; then
@@ -715,7 +709,6 @@
 	setresuid \
 	setreuid \
 	on_exit \
-	nanosleep \
 )
 
 UTMP_CHECK
@@ -803,16 +796,18 @@
 
 PTY_CHECK
 
+TTY_GROUP_CHECK
+
 dnl# --------------------------------------------------------------------------
 dnl# now add and remove other stuff
 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`"