Commit 3b47b049 authored by unknown's avatar unknown
Browse files

Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
parents 78625366 ded99464

BUILD/autorun.sh

+9 −9
Original line number Diff line number Diff line 
#!/bin/sh

# Create MySQL autotools infrastructure



aclocal    || (echo "Can't execute aclocal" && exit 1)

autoheader || (echo "Can't execute autoheader" && exit 1)

die() { echo "$@"; exit 1; }



aclocal || die "Can't execute aclocal" 

autoheader || die "Can't execute autoheader"

# --force means overwrite ltmain.sh script if it already exists 

# Added glibtoolize reference to make native OSX autotools work

if [ -f /usr/bin/glibtoolize ] ; then

  glibtoolize --automake --force \

             || (echo "Can't execute glibtoolize" && exit 1)

  glibtoolize --automake --force || die "Can't execute glibtoolize"

else

  libtoolize --automake --force \

             || (echo "Can't execute libtoolize" && exit 1)

  libtoolize --automake --force || die "Can't execute libtoolize"

fi

  

# --add-missing instructs automake to install missing auxiliary files

# and --force to overwrite them if they already exist

automake --add-missing --force \

           || (echo "Can't execute automake" && exit 1)

autoconf   || (echo "Can't execute autoconf" && exit 1)

automake --add-missing --force || die "Can't execute automake"

autoconf || die "Can't execute autoconf"

(cd bdb/dist && sh s_all)

(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)

VC++Files/client/mysqlclient.dsp

+0 −4
Original line number Diff line number Diff line
@@ -451,10 +451,6 @@ SOURCE=..\mysys\my_symlink2.c 
# End Source File

# Begin Source File



SOURCE=..\mysys\my_tempnam.c

# End Source File

# Begin Source File



SOURCE=..\libmysql\my_time.c

# End Source File

# Begin Source File

VC++Files/client/mysqlclient_ia64.dsp

+0 −4
Original line number Diff line number Diff line
@@ -436,10 +436,6 @@ SOURCE=..\mysys\my_symlink2.c 
# End Source File

# Begin Source File



SOURCE=..\mysys\my_tempnam.c

# End Source File

# Begin Source File



SOURCE=..\mysys\my_thr_init.c

# End Source File

# Begin Source File

VC++Files/libmysql/libmysql.dsp

+0 −4
Original line number Diff line number Diff line
@@ -419,10 +419,6 @@ SOURCE=..\mysys\my_symlink2.c 
# End Source File

# Begin Source File



SOURCE=..\mysys\my_tempnam.c

# End Source File

# Begin Source File



SOURCE=..\mysys\my_thr_init.c

# End Source File

# Begin Source File

VC++Files/libmysql/libmysql_ia64.dsp

+0 −4
Original line number Diff line number Diff line
@@ -406,10 +406,6 @@ SOURCE=..\mysys\my_symlink2.c 
# End Source File

# Begin Source File



SOURCE=..\mysys\my_tempnam.c

# End Source File

# Begin Source File



SOURCE=..\mysys\my_thr_init.c

# End Source File

# Begin Source File