mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 18:20:07 +01:00
configure.in, net_serv.cc, compile-netware-END:
Changes for Netware sql/net_serv.cc: Netware needs <sys/select.h> configure.in: Call of "comp_err" has moved, changed code for Netware that edits make files to reflect this netware/BUILD/compile-netware-END: After correcting "configure.in" to edit make files correctly, removed obsolete "sed" of "extra/Makefile.am" for Netware
This commit is contained in:
parent
12ea72d1b9
commit
91fb831076
3 changed files with 7 additions and 8 deletions
|
@ -1137,7 +1137,7 @@ dnl Is this the right match for DEC OSF on alpha?
|
|||
# Edit Makefile.in files.
|
||||
#
|
||||
echo -n "configuring Makefile.in files for NetWare... "
|
||||
for file in sql/Makefile.in libmysql/Makefile.in libmysql_r/Makefile.in sql/share/Makefile.in strings/Makefile.in client/Makefile.in
|
||||
for file in sql/Makefile.in libmysql/Makefile.in libmysql_r/Makefile.in extra/Makefile.in strings/Makefile.in client/Makefile.in
|
||||
do
|
||||
# echo "#### $file ####"
|
||||
filedir="`dirname $file`"
|
||||
|
@ -1163,9 +1163,9 @@ s,\(\./gen_lex_hash\)\$(EXEEXT),\1.linux,
|
|||
s%\(mysqld_DEPENDENCIES = \) %\1$lib_DEPENDENCIES %
|
||||
EOF
|
||||
;;
|
||||
sql/share/Makefile.in)
|
||||
extra/Makefile.in)
|
||||
cat > $filesed << EOF
|
||||
s,\(extra/comp_err\),\1.linux,
|
||||
s,\(extra/comp_err\)\$(EXEEXT),\1.linux,
|
||||
EOF
|
||||
;;
|
||||
libmysql/Makefile.in)
|
||||
|
|
|
@ -21,11 +21,6 @@ rm -rf Makefile.in.bk
|
|||
# run auto tools
|
||||
. $path/compile-AUTOTOOLS
|
||||
|
||||
# For NetWare there is no comp_err but comp_err.linux
|
||||
sed -e "s/comp_err/comp_err.linux/g" extra/Makefile.am > extra/Makefile.am.$$
|
||||
sed -e "s/replace comp_err.linux/replace comp_err/g" extra/Makefile.am.$$ > extra/Makefile.am
|
||||
rm extra/Makefile.am.$$
|
||||
|
||||
# configure
|
||||
./configure $base_configs $extra_configs
|
||||
|
||||
|
|
|
@ -52,6 +52,10 @@
|
|||
#include <signal.h>
|
||||
#include <errno.h>
|
||||
|
||||
#ifdef __NETWARE__
|
||||
#include <sys/select.h>
|
||||
#endif
|
||||
|
||||
#ifdef EMBEDDED_LIBRARY
|
||||
#undef MYSQL_SERVER
|
||||
#undef MYSQL_CLIENT
|
||||
|
|
Loading…
Add table
Reference in a new issue