diff options
| author | unknown <kent@mysql.com> | 2006-06-17 00:30:02 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2006-06-17 00:30:02 +0200 |
| commit | 91fb831076504e4760eb9bdfb1683d5221e1aeae (patch) | |
| tree | ca6dadde4a9bb33009c0a907fbba960ad9d66ddf | |
| parent | 12ea72d1b9c40ab39ef8ee98170edad72d7f2cca (diff) | |
| download | mariadb-git-91fb831076504e4760eb9bdfb1683d5221e1aeae.tar.gz | |
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
| -rw-r--r-- | configure.in | 6 | ||||
| -rwxr-xr-x | netware/BUILD/compile-netware-END | 5 | ||||
| -rw-r--r-- | sql/net_serv.cc | 4 |
3 files changed, 7 insertions, 8 deletions
diff --git a/configure.in b/configure.in index 3c335089688..fd2cf3baf97 100644 --- a/configure.in +++ b/configure.in @@ -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) diff --git a/netware/BUILD/compile-netware-END b/netware/BUILD/compile-netware-END index f7da0d9596e..c5c08cea908 100755 --- a/netware/BUILD/compile-netware-END +++ b/netware/BUILD/compile-netware-END @@ -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 diff --git a/sql/net_serv.cc b/sql/net_serv.cc index c80bb8bad9a..cf9dc6e3f60 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -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 |