Index: configure.in
===================================================================
--- configure.in.orig	2007-08-02 00:45:15.851154004 +0200
+++ configure.in	2007-08-02 00:45:23.287603014 +0200
@@ -1009,7 +1009,7 @@ AC_SUBST(LINKCC)
 AC_AIX
 
 # system check
-AC_CANONICAL_TARGET
+AC_CANONICAL_TARGET([])
 changequote(, )
 PARTIALTARGETOS=`echo $target_os | sed 's/[-._].*//'`
 changequote([, ])
@@ -2737,8 +2737,6 @@ AC_ARG_WITH(libwrap,
         [
 	    AC_MSG_RESULT([no])
 	    # Linux RedHat 6.1 won't link libwrap without libnsl
-	    AC_CHECK_FUNC(yp_get_default_domain, ,
-		AC_CHECK_LIB(nsl, yp_get_default_domain))
 	    AC_MSG_CHECKING([for TCP wrappers library -lwrap linked with -lnsl])
 	    AC_TRY_LINK([#include <sys/types.h>
 		         #include <tcpd.h>
@@ -4521,7 +4519,7 @@ fi
 # we need to have a local variable `hz' in scope and set to a useful
 # value whenever we use one of these constants.
 #
-AC_CACHE_CHECK(whether TCP timers depend on \`hz',ac_cv_TCPTV_NEEDS_HZ,
+AC_CACHE_CHECK(whether TCP timers depend on hz,ac_cv_TCPTV_NEEDS_HZ,
 [AC_EGREP_CPP(hz,
 [#include <netinet/tcp_timer.h>
 TCPTV_SRTTDFLT
@@ -4575,7 +4573,7 @@ fi
 
 ME=`$WHOAMI`
 if test -f /etc/resolv.conf; then
-  LOC=`cat /etc/resolv.conf | grep '^domain' | tail -1 | awk '{print $NF}'`
+  LOC=`cat /etc/resolv.conf | grep '^domain' | tail -n 1 | awk '{print $NF}'`
 else
   LOC="@no.where"
 fi