mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
zlib.m4:
Only require the more recent zlibCompileFlags() when building the server, client zlib don't need it. Makefile.am: Always build the bundled zlib static only configure.in: Look for dlopen() even if --with-mysqld-ldflags constains "-static", as this is not the same as the flag to "ld", it just informs "libtool" to link static with libraries created part of the build, even if there exists shared versions. make_binary_distribution.sh: Real "mysqlmanager" executable might be in ".libs" configure.in: Look for dlopen() even if --with-mysqld-ldflags constains "-static", as this is not the same as the flag to "ld", it just informs "libtool" to link static with libraries created part of the build, even if there exists shared versions. config/ac-macros/zlib.m4: Only require the more recent zlibCompileFlags() when building the server, client zlib don't need it. scripts/make_binary_distribution.sh: Real "mysqlmanager" executable might be in ".libs" zlib/Makefile.am: Always build the bundled zlib static only
This commit is contained in:
@ -115,7 +115,12 @@ if [ $BASE_SYSTEM != "netware" ] ; then
|
||||
chmod o-rwx $BASE/data $BASE/data/*
|
||||
fi
|
||||
|
||||
# Copy files if they exists, warn for those that don't
|
||||
# Copy files if they exists, warn for those that don't.
|
||||
# Note that when listing files to copy, we might list the file name
|
||||
# twice, once in the directory location where it is build, and a
|
||||
# second time in the ".libs" location. In the case the firs one
|
||||
# is a wrapper script, the second one will overwrite it with the
|
||||
# binary file.
|
||||
copyfileto()
|
||||
{
|
||||
destdir=$1
|
||||
@ -165,6 +170,7 @@ if [ $BASE_SYSTEM = "netware" ] ; then
|
||||
# For all other platforms:
|
||||
else
|
||||
BIN_FILES="$BIN_FILES \
|
||||
server-tools/instance-manager/.libs/mysqlmanager \
|
||||
client/mysqltestmanagerc \
|
||||
client/mysqltestmanager-pwgen tools/mysqltestmanager \
|
||||
client/.libs/mysql client/.libs/mysqlshow client/.libs/mysqladmin \
|
||||
|
Reference in New Issue
Block a user