diff options
| author | unknown <joerg@trift2.> | 2007-10-19 19:22:27 +0200 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-10-19 19:22:27 +0200 |
| commit | 166cd83de0e796efee06b0c8f576cbe6db6f6326 (patch) | |
| tree | f71dd0c6ec5c25d0e23f0d1e14b7ef6a0908600e /configure.in | |
| parent | a0d2cee79941f26cd7877e18f301a8092641ef0b (diff) | |
| parent | da29a105b60532b85c2ceb45bd70bed91be54eba (diff) | |
| download | mariadb-git-166cd83de0e796efee06b0c8f576cbe6db6f6326.tar.gz | |
Merge trift2.:/MySQL/M51/bug31644-5.1
into trift2.:/MySQL/M51/push-5.1
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 48e6a6bc272..94a2caa67c1 100644 --- a/configure.in +++ b/configure.in @@ -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) |