--- rxvt-unicode/configure.ac	2006/01/22 10:08:35	1.21
+++ rxvt-unicode/configure.ac	2006/01/23 10:10:39	1.26
@@ -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"
@@ -239,24 +239,6 @@
     support_styles=$enableval
   fi])
 
-AC_ARG_ENABLE(utmp,
-  [  --enable-utmp           enable utmp (utmpx) support],
-  [if test x$enableval = xyes -o x$enableval = xno; then
-    support_utmp=$enableval
-  fi])
-
-AC_ARG_ENABLE(wtmp,
-  [  --enable-wtmp           enable wtmp (wtmpx) support (requires --enable-utmp)],
-  [if test x$enableval = xyes -o x$enableval = xno; then
-    support_wtmp=$enableval
-  fi])
-
-AC_ARG_ENABLE(lastlog,
-  [  --enable-lastlog        enable lastlog support (requires --enable-utmp)],
-  [if test x$enableval = xyes -o x$enableval = xno; then
-    support_lastlog=$enableval
-  fi])
-
 AC_ARG_ENABLE(xpm-background,
   [  --enable-xpm-background enable XPM background pixmaps],
   [if test x$enableval = xyes -o x$enableval = xno; then
@@ -327,12 +309,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
@@ -491,7 +467,6 @@
 dnl# --------------------------------------------------------------------------
 
 AC_PATH_PROG(MV, mv, mv)
-AC_PATH_PROG(RM, rm, rm)
 AC_PATH_PROG(CP, cp, cp)
 AC_PATH_PROG(LN, ln, ln)
 AC_PATH_PROG(SED, sed, sed)
@@ -802,16 +777,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`"
@@ -861,15 +838,6 @@
 if test x$support_mouseslipwheel = xyes; then
   AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling)
 fi
-if test x$support_utmp = xyes; then
-  AC_DEFINE(UTMP_SUPPORT, 1, Define if you want to have utmp/utmpx support)
-fi
-if test x$support_wtmp = xyes; then
-  AC_DEFINE(WTMP_SUPPORT, 1, Define if you want to have wtmp support when utmp/utmpx is enabled)
-fi
-if test x$support_lastlog = xyes; then
-  AC_DEFINE(LASTLOG_SUPPORT, 1, Define if you want to have lastlog support when utmp/utmpx is enabled)
-fi
 if test x$support_xim = xyes -o x$multichar_set = xyes; then
   if test x$rxvt_cv_func_xlocale = xyes; then
     AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input)
@@ -1052,18 +1020,6 @@
   echo "  Xpm library:                $XPM_LIBS"
 fi
 
-if test x$support_utmp != xyes; then
-  echo "  utmp support:               disabled"
-  echo
-else
-  echo "  utmp support:               enabled
-  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"
 fi