diff options
| author | unknown <kent@kent-amd64.(none)> | 2006-11-27 23:12:05 +0100 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2006-11-27 23:12:05 +0100 |
| commit | 90feb661d5af4de00eb4165e575c145f722b92c5 (patch) | |
| tree | bb94dba41000bf4e2bcc5bd5ebbfe118fb9db103 /config | |
| parent | d2f7b75b9e978c814cf0caf02fbd866db385ed49 (diff) | |
| parent | e9c502b3995c2e8dd0b5c3fb878e371a548989ba (diff) | |
| download | mariadb-git-90feb661d5af4de00eb4165e575c145f722b92c5.tar.gz | |
Merge mysql.com:/home/kent/bk/mysql-5.0
into mysql.com:/home/kent/bk/mysql-5.1
BitKeeper/deleted/.del-gen_rec.awk:
Auto merged
client/mysql_upgrade.c:
Auto merged
configure.in:
Auto merged
extra/yassl/src/Makefile.am:
Auto merged
extra/yassl/taocrypt/benchmark/Makefile.am:
Auto merged
extra/yassl/taocrypt/benchmark/benchmark.dsp:
Auto merged
extra/yassl/taocrypt/src/Makefile.am:
Auto merged
extra/yassl/taocrypt/taocrypt.dsp:
Auto merged
extra/yassl/taocrypt/taocrypt.vcproj:
Auto merged
extra/yassl/taocrypt/test.dsp:
Auto merged
extra/yassl/taocrypt/test/Makefile.am:
Auto merged
extra/yassl/testsuite/Makefile.am:
Auto merged
extra/yassl/testsuite/testsuite.dsp:
Auto merged
extra/yassl/yassl.dsp:
Auto merged
extra/yassl/yassl.vcproj:
Auto merged
include/my_sys.h:
Auto merged
libmysql/Makefile.shared:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
BitKeeper/deleted/.del-ha_berkeley.m4:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
sql-common/my_time.c:
Auto merged
storage/ndb/config/common.mk.am:
Auto merged
storage/ndb/config/type_kernel.mk.am:
Auto merged
storage/ndb/config/type_ndbapi.mk.am:
Auto merged
storage/ndb/config/type_ndbapitest.mk.am:
Auto merged
storage/ndb/config/type_ndbapitools.mk.am:
Auto merged
storage/ndb/config/type_util.mk.am:
Auto merged
Docs/Makefile.am:
SCCS merged
Diffstat (limited to 'config')
| -rw-r--r-- | config/ac-macros/ha_ndbcluster.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/ac-macros/ha_ndbcluster.m4 b/config/ac-macros/ha_ndbcluster.m4 index a722f8f1d7d..26cb0394583 100644 --- a/config/ac-macros/ha_ndbcluster.m4 +++ b/config/ac-macros/ha_ndbcluster.m4 @@ -187,7 +187,7 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [ ndb_cxxflags_fix="" TEST_NDBCLUSTER="--ndbcluster" - ndbcluster_includes="-I\$(top_builddir)/storage/ndb/include -I\$(top_builddir)/storage/ndb/include/ndbapi -I\$(top_builddir)/storage/ndb/include/mgmapi" + ndbcluster_includes="-I\$(top_builddir)/storage/ndb/include -I\$(top_srcdir)/storage/ndb/include -I\$(top_srcdir)/storage/ndb/include/ndbapi -I\$(top_srcdir)/storage/ndb/include/mgmapi" ndbcluster_libs="\$(top_builddir)/storage/ndb/src/.libs/libndbclient.a" ndbcluster_system_libs="" ndb_mgmclient_libs="\$(top_builddir)/storage/ndb/src/mgmclient/libndbmgmclient.la" |