591873
diff --git a/configure.ac b/configure.ac
17f00d
index c0f02df..b76c8f5 100644
591873
--- a/configure.ac
591873
+++ b/configure.ac
1c81c3
@@ -188,7 +188,8 @@ AC_EGREP_CPP(yes,
1c81c3
 ], AC_NOTE(- you have a SVR4 system) AC_DEFINE(SVR4) svr4=1)
1c81c3
 if test -n "$svr4" ; then
6f40f5
 oldlibs="$LIBS"
6f40f5
-LIBS="$LIBS -lelf"
591873
+# Humm we don't actually need to link against libelf for Linux
6f40f5
+LIBS="$LIBS"
6f40f5
 AC_CHECKING(SVR4)
6f40f5
 AC_TRY_LINK([#include <utmpx.h>
6f40f5
 ],,
17f00d
@@ -626,14 +627,10 @@ dnl
6f40f5
 AC_CHECKING(for tgetent)
6f40f5
 AC_TRY_LINK(,tgetent((char *)0, (char *)0);,,
6f40f5
 olibs="$LIBS"
6f40f5
-LIBS="-lcurses $olibs"
6f40f5
-AC_CHECKING(libcurses)
6f40f5
+LIBS="-ltinfo $olibs"
6f40f5
+AC_CHECKING(libtinfo)
6f40f5
 AC_TRY_LINK(,[
6f40f5
-#ifdef __hpux
6f40f5
-__sorry_hpux_libcurses_is_totally_broken_in_10_10();
6f40f5
-#else
6f40f5
 tgetent((char *)0, (char *)0);
6f40f5
-#endif
6f40f5
 ],,
6f40f5
 LIBS="-ltermcap $olibs"
6f40f5
 AC_CHECKING(libtermcap)
17f00d
@@ -658,7 +655,7 @@ AC_MSG_ERROR(!!! no tgetent - no screen)))))))))
6f40f5
 AC_TRY_RUN([
6f40f5
 main()
6f40f5
 {
6f40f5
- exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1);
591873
+    return 1;
6f40f5
 }], AC_NOTE(- you use the termcap database),
1c81c3
 AC_NOTE(- you use the terminfo database) AC_DEFINE(TERMINFO),
1c81c3
 AC_NOTE(- skipping check because we are cross compiling; assuming terminfo database is used) AC_DEFINE(TERMINFO))
17f00d
@@ -864,11 +861,6 @@ fi
6f40f5
 dnl
6f40f5
 dnl    ****  loadav  ****
6f40f5
 dnl
1c81c3
-if test "$cross_compiling" = no ; then
6f40f5
-AC_CHECKING(for libutil(s))
6f40f5
-test -f /usr/lib/libutils.a && LIBS="$LIBS -lutils"
6f40f5
-test -f /usr/lib/libutil.a && LIBS="$LIBS -lutil"
1c81c3
-fi
6f40f5
 
6f40f5
 AC_CHECKING(getloadavg)
6f40f5
 AC_TRY_LINK(,[getloadavg((double *)0, 0);],