Commit 48d38156 authored by unknown's avatar unknown
Browse files

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-new
parents c93a8ebb d497966a

configure.in

+4 −1
Original line number Diff line number Diff line
@@ -2548,9 +2548,12 @@ AC_SUBST(CC) 
AC_SUBST(GXX)



# Set configuration options for make_binary_distribution



CONF_ARGS=

case $SYSTEM_TYPE in

  *netware*)

    MAKE_BINARY_DISTRIBUTION_OPTIONS=--no-strip

    CONF_ARGS=--host="$MACHINE_TYPE-$SYSTEM_TYPE"

    ;;

  *)

    MAKE_BINARY_DISTRIBUTION_OPTIONS=
@@ -2558,7 +2561,7 @@ case $SYSTEM_TYPE in 
esac



for CONF in $other_configures; do

  (cd `dirname $CONF`; ./`basename $CONF` --build=$build_alias)

  (cd `dirname $CONF`; ./`basename $CONF` $CONF_ARGS --build=$build_alias)

done



AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS)

include/config-netware.h

+21 −0
Original line number Diff line number Diff line
@@ -19,6 +19,14 @@ 
#ifndef _config_netware_h

#define _config_netware_h



#define __event_h__

#define _EVENT_H_

/* 

  These two #define(s) are needed as both libc of NetWare and MySQL have 

  files named event.h which causes compilation errors.

*/





/* required headers */

#include <unistd.h>

#include <stdio.h>
@@ -35,6 +43,12 @@ 
#include <pthread.h>

#include <termios.h>



#undef _EVENT_H_

/* 

  This #undef exists here because both libc of NetWare and MySQL have 

  files named event.h which causes compilation errors.

*/



#ifdef __cplusplus

extern "C" {

#endif
@@ -65,6 +79,13 @@ extern "C" { 
#undef HAVE_STPCPY

/* changes  end  */



/* Changes made to make use of LibC-June-2005 for building purpose */

#undef HAVE_GETPASS

#undef HAVE_GETRLIMIT

#undef HAVE_GETRUSAGE

#undef HAVE_INITGROUPS

/* Changes  end  - LibC-June-2005 */



/* no libc crypt() function */

#ifdef HAVE_OPENSSL

  #define HAVE_CRYPT 1

netware/BUILD/compile-AUTOTOOLS

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
# stop on errors

set -e



for package in . ./innobase

for package in . ./storage/innobase

do

	(cd $package

	rm -rf config.cache autom4te.cache

netware/BUILD/compile-linux-tools

+4 −4
Original line number Diff line number Diff line
@@ -37,11 +37,11 @@ make 
(cd dbug; make libdbug.a)

(cd strings; make libmystrings.a)

(cd mysys; make libmysys.a)

(cd heap; make libheap.a)

(cd storage/heap; make libheap.a)

(cd vio; make libvio.a)

(cd regex; make libregex.a)

(cd myisam; make libmyisam.a)

(cd myisammrg; make libmyisammrg.a)

(cd storage/myisam; make libmyisam.a)

(cd storage/myisammrg; make libmyisammrg.a)

(cd extra; make comp_err)

(cd libmysql; make conf_to_src)

(cd libmysql_r; make conf_to_src)
@@ -57,7 +57,7 @@ make 
cp extra/comp_err extra/comp_err.linux

cp libmysql/conf_to_src libmysql/conf_to_src.linux

#cp libmysql_r/conf_to_src libmysql_r/conf_to_src.linux

cp sql/.libs/gen_lex_hash sql/gen_lex_hash.linux

cp sql/gen_lex_hash sql/gen_lex_hash.linux

cp strings/conf_to_src strings/conf_to_src.linux



# Delete mysql_version.h

netware/BUILD/compile-netware-END

+2 −3
Original line number Diff line number Diff line
@@ -22,9 +22,8 @@ rm -rf Makefile.in.bk 
. $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.$$

sed -e "s/comp_err\$(EXEEXT)/comp_err.linux/g" extra/Makefile.am > extra/Makefile.am.$$

mv extra/Makefile.am.$$ extra/Makefile.am



# configure

./configure $base_configs $extra_configs