Merge branch 'handle-hanging-nfs'

* handle-hanging-nfs:
  NEWS: Mention check_disk enhancement
  Cosmetic change: s/THRLIBS/THREADLIBS/
  configure.ac: Don't let pthread check depend on OS
  check_disk: Seperate declarations from code
  check_disk: Remove unused status variable
  check_disk: Fix pthread start routine type
  Don't let check_disk hang on hanging file systems

1 files changed, 6 insertions, 0 deletions

diff --git a/configure.ac b/configure.ac
index a6c9e79..fb8f950 100644
--- a/configure.ac
+++ b/configure.ac
@@ -156,6 +156,12 @@ AC_CHECK_LIB(socket,socket,SOCKETLIBS="$SOCKETLIBS -lsocket")
 AC_CHECK_LIB(resolv,main,SOCKETLIBS="$SOCKETLIBS -lresolv")
 AC_SUBST(SOCKETLIBS)
 
+dnl Check for POSIX thread libraries
+AC_CHECK_HEADERS(pthread.h)
+AC_CHECK_LIB(pthread,pthread_create,THREADLIBS="-lpthread",
+             AC_CHECK_LIB(pthread,pthread_create,THREADLIBS="-lpthread -lrt",-lrt))
+AC_SUBST(THREADLIBS)
+
 dnl
 dnl check for math-related functions needing -lm
 AC_CHECK_HEADERS(math.h)