diff options
| author | unknown <jimw@mysql.com> | 2005-08-23 11:25:24 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-08-23 11:25:24 -0700 |
| commit | 4b9431369611b4c3938288c0ef9eaa282f1bb417 (patch) | |
| tree | 8f25e99f65e13c5974f8f6c711c8e7e6a78520a7 /tests/Makefile.am | |
| parent | 4eccc160525552fd2421f5dc4b33afb320f2d52b (diff) | |
| download | mariadb-git-4b9431369611b4c3938288c0ef9eaa282f1bb417.tar.gz | |
Fix build using --without-server. (Bug #11680)
configure.in:
Fix directories built using --without-server, and add mf_keycache.o
to list of objects only built for thread-safe library, since it requires
threading.
dbug/my_main.c:
Don't try to initialize thread globals if not built with threading.
mysys/Makefile.am:
Remove mf_keycache.c from list of files to build (it will be included
in THREAD_LOBJECTS when appropriate).
mysys/mf_getdate.c:
Fix usage of gmtime().
sql/share/Makefile.am:
Allow removal of mysqld_error.h to fail, in case it doesn't exist yet.
tests/Makefile.am:
Don't link against libmysys explicitly.
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index ca7f04c91f9..131f8b1b625 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -42,8 +42,7 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ LIBS = @CLIENT_LIBS@ LDADD = @CLIENT_EXTRA_LDFLAGS@ \ $(top_builddir)/libmysql/libmysqlclient.la -mysql_client_test_LDADD= $(LDADD) $(CXXLDFLAGS) \ - $(top_builddir)/mysys/libmysys.a +mysql_client_test_LDADD= $(LDADD) $(CXXLDFLAGS) mysql_client_test_SOURCES= mysql_client_test.c $(yassl_dummy_link_fix) insert_test_SOURCES= insert_test.c $(yassl_dummy_link_fix) select_test_SOURCES= select_test.c $(yassl_dummy_link_fix) |