--- rxvt-unicode/configure.ac	2006/01/21 19:50:53	1.16
+++ rxvt-unicode/configure.ac	2006/01/23 09:56:47	1.25
@@ -50,12 +50,12 @@
       [AC_LANG_PROGRAM([struct test { }; void f() try { throw new test; } catch (...) { throw; }])],
       [AC_MSG_RESULT(ok)],
       [
-         AC_MSG_RESULT([no, make everything bigger and slower])
-         CXX="$save_CXX"
+         AC_MSG_RESULT([no, making everything bigger and slower])
          LIBS="$save_LIBS"
-         LINKER="$CXX"
+         LINKER="$save_CXX"
       ]
    )
+   CXX="$save_CXX"
 fi
 AC_SUBST(LINKER,[$LINKER])
 
@@ -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
@@ -491,7 +485,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)
@@ -715,7 +708,6 @@
 	setresuid \
 	setreuid \
 	on_exit \
-	nanosleep \
 )
 
 UTMP_CHECK
@@ -783,42 +775,7 @@
   AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works)
 fi
 
-AC_CACHE_CHECK(for unix-compliant filehandle passing ability, rxvt_can_pass_fds,
-[AC_TRY_LINK([
-#include <cstddef> // broken bsds (is that redundant) need this
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/uio.h>
-],[
-{
-  msghdr msg;
-  iovec iov;
-  char buf [100];
-  char data = 0;
-
-  iov.iov_base = &data;
-  iov.iov_len  = 1;
-
-  msg.msg_iov        = &iov;
-  msg.msg_iovlen     = 1;
-  msg.msg_control    = buf;
-  msg.msg_controllen = sizeof buf;
-
-  cmsghdr *cmsg = CMSG_FIRSTHDR (&msg);
-  cmsg->cmsg_level = SOL_SOCKET;
-  cmsg->cmsg_type  = SCM_RIGHTS;
-  cmsg->cmsg_len   = 100;
-
-  *(int *)CMSG_DATA (cmsg) = 5;
-
-  return sendmsg (3, &msg, 0);
-}
-],[rxvt_can_pass_fds=yes],[rxvt_can_pass_fds=no])])
-if test x$rxvt_can_pass_fds = xyes; then
-   AC_DEFINE(HAVE_UNIX_FDPASS, 1, Define if sys/socket.h defines the necessary macros/functions for file handle passing)
-else
-   AC_MSG_ERROR([urxvt requires unix-compliant filehandle passing ability])
-fi
+SCM_RIGHTS_CHECK
 
 AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb,
 [AC_COMPILE_IFELSE([
@@ -838,12 +795,23 @@
 
 PTY_CHECK
 
+TTY_GROUP_CHECK
+
 dnl# --------------------------------------------------------------------------
 dnl# now add and remove other stuff
 dnl# --------------------------------------------------------------------------
 if test x$support_xft = xyes; then
-  LIBS="$LIBS `pkg-config xft --libs`"
-  CPPFLAGS="$CPPFLAGS `pkg-config xft --cflags`"
+  AC_PATH_PROG(PKG_CONFIG, pkg-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`"
+    fi
+  fi
 
   AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
   AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no])
@@ -1079,22 +1047,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"
@@ -1108,6 +1071,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     ."