mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

A fix for Bug#6273 "building fails on link": we should not use

Browse source 
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.
This commit is contained in:
unknown 2005-02-05 01:21:16 +03:00
commit fe83a1938d
5 changed files with 31 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
zlib/Makefile.am
View file

@ -16,7 +16,7 @@
# Process this file with automake to create Makefile.in
noinst_LTLIBRARIES=libz.la
pkglib_LTLIBRARIES=libz.la
noinst_HEADERS= crc32.h deflate.h inffast.h inffixed.h inflate.h \
inftrees.h trees.h zconf.h zlib.h zutil.h