Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0

acinclude.m4

@@ -800,7 +800,7 @@ dnl get substituted.
 AC_DEFUN(MYSQL_CHECK_ORBIT, [
 AC_MSG_CHECKING(for ORBit)
 orbit_config_path=`which orbit-config`
-if test -n "$orbit_config_path"
+if test -n "$orbit_config_path" -a $? = 0
 then
   orbit_exec_prefix=`orbit-config --exec-prefix`
   orbit_includes=`orbit-config --cflags server`