Commit 3bf9a40c authored by unknown's avatar unknown

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

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release

parents 759715eb 624cc522
...@@ -101,12 +101,12 @@ tags: ...@@ -101,12 +101,12 @@ tags:
test: test:
cd mysql-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: test-force:
cd mysql-test; \ cd mysql-test; \
perl mysql-test-run.pl --force ;\ ./mysql-test-run --force ;\
perl mysql-test-run.pl --ps-protocol --force ./mysql-test-run --ps-protocol --force
# Don't update the files from bitkeeper # Don't update the files from bitkeeper
%::SCCS/s.% %::SCCS/s.%
...@@ -342,7 +342,7 @@ AC_SUBST(CXXFLAGS) ...@@ -342,7 +342,7 @@ AC_SUBST(CXXFLAGS)
AC_SUBST(LD) AC_SUBST(LD)
AC_SUBST(INSTALL_SCRIPT) AC_SUBST(INSTALL_SCRIPT)
export CC CXX CFLAGS LD LDFLAGS AR export CC CXX CFLAGS LD LDFLAGS AR ARFLAGS
if test "$GCC" = "yes" if test "$GCC" = "yes"
then then
......
...@@ -117,6 +117,13 @@ case "$target" in ...@@ -117,6 +117,13 @@ case "$target" in
CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE";; CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE";;
esac 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 AC_OUTPUT(Makefile os/Makefile ut/Makefile btr/Makefile dnl
buf/Makefile data/Makefile dnl buf/Makefile data/Makefile dnl
dict/Makefile dyn/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