Use if block rather than an or expression

diff --git a/sapi/thttpd/config.m4 b/sapi/thttpd/config.m4
index cb3764152bab17fa54ee855ef5a11f07454f8add..2cea7c0677d3e85a0137a97e9ec89d42ee3d8d3e 100644 (file)
--- a/sapi/thttpd/config.m4
+++ b/sapi/thttpd/config.m4
@@ -4,8 +4,14 @@ dnl
 
 AC_ARG_WITH(thttpd,
 [  --with-thttpd=SRCDIR    Build PHP as thttpd module],[
-  test -d $withval || AC_MSG_RESULT(thttpd directory does not exist ($withval))
-  egrep thttpd.2.21b $withval/version.h >/dev/null || AC_MSG_RESULT([This version only supports thttpd-2.21b])
+set -x
+  if ! test -d $withval; then
+    AC_MSG_RESULT(thttpd directory does not exist ($withval))
+  fi
+  if ! egrep thttpd.2.21b $withval/version.h >/dev/null; then
+    AC_MSG_ERROR([This version only supports thttpd-2.21b])
+  fi
+set +x
   PHP_EXPAND_PATH($withval, THTTPD)
   PHP_TARGET_RDYNAMIC
   INSTALL_IT="\