Commit 293c2259 authored by kent@mysql.com's avatar kent@mysql.com

Merge mysqldev@production.mysql.com:my/mysql-5.0-release

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
parents ffff7cb3 5d515df4
......@@ -101,12 +101,12 @@ tags:
test:
cd mysql-test; \
perl mysql-test-run.pl && perl mysql-test-run.pl --ps-protocol
./mysql-test-run && ./mysql-test-run --ps-protocol
test-force:
cd mysql-test; \
perl mysql-test-run.pl --force ;\
perl mysql-test-run.pl --ps-protocol --force
./mysql-test-run --force ;\
./mysql-test-run --ps-protocol --force
# Don't update the files from bitkeeper
%::SCCS/s.%
......@@ -342,7 +342,7 @@ AC_SUBST(CXXFLAGS)
AC_SUBST(LD)
AC_SUBST(INSTALL_SCRIPT)
export CC CXX CFLAGS LD LDFLAGS AR
export CC CXX CFLAGS LD LDFLAGS AR ARFLAGS
if test "$GCC" = "yes"
then
......
......@@ -117,6 +117,13 @@ case "$target" in
CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE";;
esac
# must go in pair with AR as set by MYSQL_CHECK_AR
if test -z "$ARFLAGS"
then
ARFLAGS="cru"
fi
AC_SUBST(ARFLAGS)
AC_OUTPUT(Makefile os/Makefile ut/Makefile btr/Makefile dnl
buf/Makefile data/Makefile dnl
dict/Makefile dyn/Makefile dnl
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment