diff options
| author | unknown <joreland@mysql.com> | 2004-05-27 19:59:38 +0200 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2004-05-27 19:59:38 +0200 |
| commit | 486494b3ec6293a1705a2aad85e37beeb88503f7 (patch) | |
| tree | 5711d1c4442e7d0a2c1f033e65ffffc8a69f6322 /configure.in | |
| parent | 489aa9be1ce31a0b7f4e8901faa818b21a8f7c7a (diff) | |
| parent | fb014155b88ebedb9b742ce3cb3adb6500f4aa64 (diff) | |
| download | mariadb-git-486494b3ec6293a1705a2aad85e37beeb88503f7.tar.gz | |
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/configure.in b/configure.in index fb4bd0720ba..f3d785ff19e 100644 --- a/configure.in +++ b/configure.in @@ -1120,7 +1120,7 @@ dnl Is this the right match for DEC OSF on alpha? sql/Makefile.in) # Use gen_lex_hash.linux instead of gen_lex_hash # Add library dependencies to mysqld_DEPENDENCIES - lib_DEPENDENCIES="\$(bdb_libs_with_path) \$(innodb_libs) \$(pstack_libs) \$(innodb_system_libs) \$(openssl_libs)" + lib_DEPENDENCIES="\$(bdb_libs_with_path) \$(innodb_libs) \$(ndbcluster_libs) \$(pstack_libs) \$(innodb_system_libs) \$(openssl_libs)" cat > $filesed << EOF s,\(^.*\$(MAKE) gen_lex_hash\)\$(EXEEXT),#\1, s,\(\./gen_lex_hash\)\$(EXEEXT),\1.linux, @@ -2659,6 +2659,7 @@ if expr "$SYSTEM_TYPE" : ".*netware.*" > /dev/null; then fi AC_SUBST(netware_dir) AC_SUBST(linked_netware_sources) +AM_CONDITIONAL(HAVE_NETWARE, test "$netware_dir" = "netware") if test "$with_server" = "yes" -o "$THREAD_SAFE_CLIENT" != "no" then @@ -2924,9 +2925,6 @@ AC_SUBST(mgmapiincludedir) #AC_SUBST(NDB_TYPE_KERNEL) #AC_SUBST(NDB_TYPE_UTIL) -# define(NDB_MAKEFILES, [ dnl -# ]) - AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS) # Output results |