diff options
author | unknown <mysql@mc04.(none)> | 2004-09-16 09:21:49 +0200 |
---|---|---|
committer | unknown <mysql@mc04.(none)> | 2004-09-16 09:21:49 +0200 |
commit | d159d111da398b1b1ed59a56f2357692bf2a8ab1 (patch) | |
tree | 4607d1174b87192db3af2f5f44ecde3190fb6e87 /configure.in | |
parent | 149b45b8f3773dbe727dcad2a81714c0a84c9576 (diff) | |
parent | 49dc3a53011fde94b900762084cd0631cb4fb24a (diff) | |
download | mariadb-git-d159d111da398b1b1ed59a56f2357692bf2a8ab1.tar.gz |
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mc04.(none):/space/mysql/mysql-4.1-ndb
acinclude.m4:
Auto merged
configure.in:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
sql/Makefile.am:
Auto merged
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 0704123f082..341fd7ba0d9 100644 --- a/configure.in +++ b/configure.in @@ -3024,11 +3024,11 @@ AC_SUBST([ndb_port_base]) ndb_transporter_opt_objs="" if test X"$have_ndb_shm" = Xyes then - ndb_transporter_opt_objs="$(ndb_transporter_opt_objs) SHM_Transporter.lo SHM_Transporter.unix.lo" + ndb_transporter_opt_objs="$ndb_transporter_opt_objs SHM_Transporter.lo SHM_Transporter.unix.lo" fi if test X"$have_ndb_sci" = Xyes then - ndb_transporter_opt_objs="$(ndb_transporter_opt_objs) SCI_Transporter.lo" + ndb_transporter_opt_objs="$ndb_transporter_opt_objs SCI_Transporter.lo" fi AC_SUBST([ndb_transporter_opt_objs]) |