Merge branch 'sni'

diff --git a/configure.in b/configure.in
index b77eae8..0f47c26 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -19,6 +19,9 @@ if test "$HAS_MAGIC" = no; then
        AC_MSG_ERROR([*** cannot find libmagic on this system])
 fi
 
+AH_TEMPLATE(HAVE_VALGRIND, [define to include debugging support for Valgrind])
+AC_CHECK_HEADER(valgrind/memcheck.h, [AC_DEFINE(HAVE_VALGRIND)], [])
+
 AH_TEMPLATE(HAVE_XATTR, [define to compile support for filesystem extended attributes])
 AC_ARG_WITH(xattr, [  --with-xattr            Enable XATTR support])
 HAS_XATTR=""

diff --git a/doc/ashd.doc b/doc/ashd.doc
index 986fde1..eb081b7 100644 (file)
--- a/doc/ashd.doc
+++ b/doc/ashd.doc
@@ -163,4 +163,4 @@ Fredrik Tolf <fredrik@dolda2000.com>
 
 SEE ALSO
 --------
-*htparser*(1)
+*htparser*(1), RFC 2616

diff --git a/doc/htextauth.doc b/doc/htextauth.doc
index fb32f56..d124652 100644 (file)
--- a/doc/htextauth.doc
+++ b/doc/htextauth.doc
@@ -79,4 +79,4 @@ Fredrik Tolf <fredrik@dolda2000.com>
 
 SEE ALSO
 --------
-*ashd*(7)
+*ashd*(7), RFC 2617

diff --git a/lib/mt.c b/lib/mt.c
index db37936..c4dcf86 100644 (file)
--- a/lib/mt.c
+++ b/lib/mt.c
@@ -25,7 +25,10 @@
 #endif
 #include <utils.h>
 #include <mt.h>
+
+#ifdef HAVE_VALGRIND
 #include <valgrind/memcheck.h>
+#endif
 
 struct muth *current = NULL;
 static ucontext_t mainctxt;