diff options
| author | unknown <joerg@trift2.> | 2007-10-19 19:19:15 +0200 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-10-19 19:19:15 +0200 |
| commit | f3eed850c75261562361dae6b616af30a5fa6906 (patch) | |
| tree | 4d0817aaf1db6cd5a0b990a3b6705696b168cbde /configure.in | |
| parent | b85e1046dd7a1615f657428b4037af2a297781f0 (diff) | |
| parent | a9624698be3d1aca47454fb9a5060c637e6b1d66 (diff) | |
| download | mariadb-git-f3eed850c75261562361dae6b616af30a5fa6906.tar.gz | |
Merge trift2.:/MySQL/M50/bug31644-5.0
into trift2.:/MySQL/M50/push-5.0
configure.in:
Auto merged
scripts/Makefile.am:
Auto merged
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/configure.in b/configure.in index 5b41f988fd3..c423bca3faa 100644 --- a/configure.in +++ b/configure.in @@ -124,6 +124,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" @@ -131,6 +133,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) @@ -373,6 +377,7 @@ AC_SUBST(CC) AC_SUBST(CFLAGS) AC_SUBST(CXX) AC_SUBST(CXXFLAGS) +AC_SUBST(ASFLAGS) AC_SUBST(LD) AC_SUBST(INSTALL_SCRIPT) |