summaryrefslogtreecommitdiff
path: root/.cvsignore
diff options
context:
space:
mode:
authorunknown <konstantin@mysql.com>2005-02-05 01:21:16 +0300
committerunknown <konstantin@mysql.com>2005-02-05 01:21:16 +0300
commitfe83a1938d51c2fe780631911282902aeae1c0a9 (patch)
tree24ce2a2e56f50a77ba3664ff0b5fec28c4292aad /.cvsignore
parent2f91118458995b9fe780aa7a5a664765572cdc30 (diff)
downloadmariadb-git-fe83a1938d51c2fe780631911282902aeae1c0a9.tar.gz
A fix for Bug#6273 "building fails on link": we should not use
CLIENT_LIBS in mysql_config as CLIENT_LIBS point to builddir when we use the bundled zlib. acinclude.m4: Extend MYSQL_CHECK_ZLIB_WITH_COMPRESS m4 macro to substitute ZLIB_DEPS - this is a special version of ZLIB_LIBS to use in mysql_config configure.in: Remove NON_THREADED_CLIENT_LIBS which weren't really NON_THREADED_CLIENT_LIBS and use NON_THREADED_LIBS instead. AC_SUBST NON_THREADED_LIBS and STATIC_NSS_FLAGS as they're now needed inside mysql_config.sh scripts/Makefile.am: Add STATIC_NSS_FLAGS, NON_THREADED_LIBS and ZLIB_DEPS to sed substitution list. scripts/mysql_config.sh: We can't use CLIENT_LIBS as in case when we use the bundled zlib it has a reference to $(top_builddir)/zlib. libs and libs_r now need to be specified explicitly. zlib/Makefile.am: Install libz.la in case it's used by MySQL: this way we guarantee that paths printed by mysql_config are valid in all cases.
Diffstat (limited to '.cvsignore')
0 files changed, 0 insertions, 0 deletions