mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22:27 +01:00
fe83a1938d
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.
29 lines
1.1 KiB
Makefile
29 lines
1.1 KiB
Makefile
# Copyright (C) 2004 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
#
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 2 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program; if not, write to the Free Software
|
|
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
# Process this file with automake to create Makefile.in
|
|
|
|
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
|
|
|
|
libz_la_SOURCES= adler32.c compress.c crc32.c deflate.c gzio.c \
|
|
infback.c inffast.c inflate.c inftrees.c trees.c \
|
|
uncompr.c zutil.c
|
|
|
|
EXTRA_DIST= README FAQ INDEX ChangeLog algorithm.txt zlib.3
|
|
|