mirror of
https://github.com/MariaDB/server.git
synced 2026-05-06 23:25:34 +02:00
Merge trift2.:/MySQL/M51/bug31644-5.1
into trift2.:/MySQL/M51/push-5.1 configure.in: Auto merged scripts/Makefile.am: Auto merged
This commit is contained in:
commit
2436d13f33
3 changed files with 19 additions and 6 deletions
|
|
@ -95,6 +95,8 @@ case $MACHINE_TYPE in
|
|||
esac
|
||||
|
||||
# Save some variables and the command line options for mysqlbug
|
||||
SAVE_CC="$CC"
|
||||
SAVE_CXX="$CXX"
|
||||
SAVE_ASFLAGS="$ASFLAGS"
|
||||
SAVE_CFLAGS="$CFLAGS"
|
||||
SAVE_CXXFLAGS="$CXXFLAGS"
|
||||
|
|
@ -102,6 +104,8 @@ SAVE_LDFLAGS="$LDFLAGS"
|
|||
SAVE_CXXLDFLAGS="$CXXLDFLAGS"
|
||||
CONF_COMMAND="$0 $ac_configure_args"
|
||||
AC_SUBST(CONF_COMMAND)
|
||||
AC_SUBST(SAVE_CC)
|
||||
AC_SUBST(SAVE_CXX)
|
||||
AC_SUBST(SAVE_ASFLAGS)
|
||||
AC_SUBST(SAVE_CFLAGS)
|
||||
AC_SUBST(SAVE_CXXFLAGS)
|
||||
|
|
@ -340,6 +344,7 @@ AC_SUBST(CC)
|
|||
AC_SUBST(CFLAGS)
|
||||
AC_SUBST(CXX)
|
||||
AC_SUBST(CXXFLAGS)
|
||||
AC_SUBST(ASFLAGS)
|
||||
AC_SUBST(LD)
|
||||
AC_SUBST(INSTALL_SCRIPT)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue