Index: configure.d/config_os_progs
===================================================================
--- configure.d/config_os_progs
+++ configure.d/config_os_progs
@@ -153,7 +153,7 @@ AC_SUBST(NON_GNU_VPATH)
 
 #       What system are we building for
 #
-AC_CANONICAL_TARGET
+AC_CANONICAL_TARGET([])
 changequote(, )
 PARTIALTARGETOS=`echo $target_os | sed 's/[-._].*//'`
 changequote([, ])
Index: configure.d/config_os_libs
===================================================================
--- configure.d/config_os_libs
+++ configure.d/config_os_libs
@@ -235,8 +235,6 @@ if test "$with_libwrap" != "no"; then
      _wraplibs="$_wraplibs -lwrap"],
     [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>
Index: configure.d/config_os_misc4
===================================================================
--- configure.d/config_os_misc4
+++ configure.d/config_os_misc4
@@ -205,7 +205,7 @@ fi
 #
 # 	    used in agent only
 #
-AC_CACHE_CHECK([whether TCP timers depend on \`hz'],
+AC_CACHE_CHECK([whether TCP timers depend on hz],
     ac_cv_TCPTV_NEEDS_HZ,
    [AC_EGREP_CPP(hz,
         [
Index: configure.d/config_project_manual
===================================================================
--- configure.d/config_project_manual
+++ configure.d/config_project_manual
@@ -35,7 +35,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