summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorjoerg@trift2. <>2007-10-19 19:22:27 +0200
committerjoerg@trift2. <>2007-10-19 19:22:27 +0200
commit5e95b3c34cfe1c51bc854e961c47820c9adb8e09 (patch)
treef71dd0c6ec5c25d0e23f0d1e14b7ef6a0908600e /configure.in
parentb3fc7aac86a7adc9f27fe2c404eafcb1fd3f43cb (diff)
parentf3668c9f0371bf3f3fad5b599008ce1f815ef7fd (diff)
downloadmariadb-git-5e95b3c34cfe1c51bc854e961c47820c9adb8e09.tar.gz
Merge trift2.:/MySQL/M51/bug31644-5.1
into trift2.:/MySQL/M51/push-5.1
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in5
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)