--- doc/Makefile.in.	2007-12-13 18:06:54.000000000 +0100
+++ doc/Makefile.in		2008-03-28 05:50:31.843610018 +0100
@@ -521,7 +521,7 @@
 @ENABLE_GTK_DOC_TRUE@	@cd $(srcdir) && \
 @ENABLE_GTK_DOC_TRUE@	if grep "WARNING:" tmpl-build.log > /dev/null; then \
 @ENABLE_GTK_DOC_TRUE@	    cat $(DOC_MODULE)-unused.txt ; \
-@ENABLE_GTK_DOC_TRUE@	    exit 1; fi
+@ENABLE_GTK_DOC_TRUE@	fi
 @ENABLE_GTK_DOC_TRUE@	cd $(srcdir) && \
 @ENABLE_GTK_DOC_TRUE@	rm -f tmpl-build.log
 @ENABLE_GTK_DOC_TRUE@	touch tmpl-build.stamp
--- configure.	2007-12-13 18:06:53.000000000 +0100
+++ configure	2008-03-28 06:15:35.000000000 +0100
@@ -23241,8 +23241,9 @@
      if test "x$withval" = "xno"; then
        { echo "$as_me:$LINENO: result: not requested" >&5
 echo "${ECHO_T}not requested" >&6; }
-     elif test "x$withval" = "xyes" -o -d "$withval"; then
+     elif test "x$withval" = "xyes"; then
        want_croco=yes
+	 elif test -d "$withval"; then
        want_croco_path=$withval
      else
        { echo "$as_me:$LINENO: result: no" >&5
@@ -23377,8 +23378,9 @@
      if test "x$withval" = "xno"; then
        { echo "$as_me:$LINENO: result: not requested" >&5
 echo "${ECHO_T}not requested" >&6; }
-     elif test "x$withval" = "xyes" -o -d "$withval"; then
+     elif test "x$withval" = "xyes"; then
        want_tidy=yes
+	 elif test -d "$withval"; then
        want_tidy_path=$withval
      else
        { echo "$as_me:$LINENO: result: no" >&5
@@ -23602,7 +23604,7 @@
 _ACEOF
 
 	      have_tidy=yes
-	      TIDY_FLAGS="$TIDY_FLAGS -DHAVE_TIDY_H_IN_SUBDIR -DENABLE_TIDY"
+	      TIDY_FLAGS="$TIDY_FLAGS -DENABLE_TIDY"
         TIDY_LIBS="-ltidy"
         LDFLAGS="$LDFLAGS $want_tidy_path"
 
@@ -23646,8 +23648,9 @@
      if test "x$withval" = "xno"; then
        { echo "$as_me:$LINENO: result: not requested" >&5
 echo "${ECHO_T}not requested" >&6; }
-     elif test "x$withval" = "xyes" -o -d "$withval"; then
+     elif test "x$withval" = "xyes"; then
        want_clamav=yes
+	 elif test -d "$withval"; then
        want_clamav_path=$withval
      else
        { echo "$as_me:$LINENO: result: no" >&5
@@ -23904,8 +23907,9 @@
      if test "x$withval" = "xno"; then
        { echo "$as_me:$LINENO: result: not requested" >&5
 echo "${ECHO_T}not requested" >&6; }
-     elif test "x$withval" = "xyes" -o -d "$withval"; then
+     elif test "x$withval" = "xyes"; then
        want_gnutls=yes
+	 elif test -d "$withval"; then
        want_gnutls_path=$withval
      else
        { echo "$as_me:$LINENO: result: no" >&5