--- configure.	2007-12-13 18:06:53.000000000 +0100
+++ configure	2008-03-28 04:14:40.094187354 +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
@@ -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