From 2e8fc0cae2af64fb6f9c840b97ef6bf1ca6914cf Mon Sep 17 00:00:00 2001
From: unknown <serg@serg.mylan>
Date: Sat, 5 Jun 2004 13:16:29 +0200
Subject: [PATCH] one more ndb-isolating fix

---
 acinclude.m4           | 1 +
 mysql-test/Makefile.am | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/acinclude.m4 b/acinclude.m4
index 612a4d1a918..c2daf4bbc3c 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1422,6 +1422,7 @@ AC_DEFUN([MYSQL_CHECK_NDBCLUSTER], [
       ;;
   esac
 
+  AM_CONDITIONAL(HAVE_NDBCLUSTER_DB, test "have_ndbcluster" = "yes")
   AC_SUBST(ndbcluster_includes)
   AC_SUBST(ndbcluster_libs)
   AC_SUBST(ndbcluster_system_libs)
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am
index 266cc7799b0..bebb84c11db 100644
--- a/mysql-test/Makefile.am
+++ b/mysql-test/Makefile.am
@@ -17,7 +17,9 @@
 
 ## Process this file with automake to create Makefile.in
 
+if HAVE_NDBCLUSTER_DB
 SUBDIRS = ndb
+endif
 
 benchdir_root=		$(prefix)
 testdir =	        $(benchdir_root)/mysql-test