Merge mysql.com:/home/svoj/devel/mysql/mysql-5.0.8-build
into mysql.com:/home/svoj/devel/mysql/mysql-5.0.9
This commit is contained in:
commit
539d63d09a
@ -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
|
|||||||
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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user