diff options
| author | unknown <kent@mysql.com> | 2006-05-17 23:41:56 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2006-05-17 23:41:56 +0200 |
| commit | b8d4b15cf80cfa67e111d11b2e304a949b129211 (patch) | |
| tree | 200d6c17e98b7c7fded8175be7e00f5ed94878d7 /tests | |
| parent | 2d0297f093a7995b4d0224f090440ce7810d62af (diff) | |
| parent | 61bd3fa055e6d3e39ac20ed3c7568cccf955cf6e (diff) | |
| download | mariadb-git-b8d4b15cf80cfa67e111d11b2e304a949b129211.tar.gz | |
Merge
configure.in:
Auto merged
client/mysql.cc:
Auto merged
extra/yassl/src/yassl_imp.cpp:
Auto merged
tests/Makefile.am:
Auto merged
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index e9432a4c9d2..8ee64f8179c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -22,6 +22,13 @@ if HAVE_YASSL else yassl_dummy_link_fix= endif + +if THREAD_SAFE_CLIENT +LIBMYSQLCLIENT_LA = $(top_builddir)/libmysql_r/libmysqlclient_r.la +else +LIBMYSQLCLIENT_LA = $(top_builddir)/libmysql/libmysqlclient.la +endif + EXTRA_DIST = auto_increment.res auto_increment.tst \ function.res function.tst lock_test.pl lock_test.res \ export.pl big_record.pl \ @@ -42,7 +49,7 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ $(openssl_includes) LIBS = @CLIENT_LIBS@ LDADD = @CLIENT_EXTRA_LDFLAGS@ \ - $(top_builddir)/libmysql/libmysqlclient.la + $(LIBMYSQLCLIENT_LA) mysql_client_test_LDADD= $(LDADD) $(CXXLDFLAGS) -L../mysys -lmysys mysql_client_test_SOURCES= mysql_client_test.c $(yassl_dummy_link_fix) insert_test_SOURCES= insert_test.c $(yassl_dummy_link_fix) |