diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-04-02 19:46:26 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-04-02 19:46:26 +0300 |
| commit | 556071359069d2fca415b3278a0b6717a056f82b (patch) | |
| tree | 247ef2fee863aec021e1b8fd9f79dd07ddacf291 /configure.in | |
| parent | a8a63101d0c17fb080b2c47ea02441c060949f60 (diff) | |
| parent | 5ae86dca427fd69abcc6be4b19e9fe46629ad294 (diff) | |
| download | mariadb-git-556071359069d2fca415b3278a0b6717a056f82b.tar.gz | |
Merge
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
readline/Makefile.am:
Auto merged
sql/convert.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.h:
Auto merged
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/configure.in b/configure.in index a0e6b819367..9649160393a 100644 --- a/configure.in +++ b/configure.in @@ -291,19 +291,15 @@ case "$target_os" in if test "$GCC" != "yes"; then # We are using built-in inline function CFLAGS="$CFLAGS -Kalloca" - CXX="$CXX -DNO_CPLUSPLUS_ALLOCA" - else - CXX="$CXX -DNO_CPLUSPLUS_ALLOCA" fi + CXXFLAGS="$CXXFLAGS -DNO_CPLUSPLUS_ALLOCA" ;; sysv5OpenUNIX8*) if test "$GCC" != "yes"; then # We are using built-in inline function CFLAGS="$CFLAGS -Kalloca" - CXX="$CXX -DNO_CPLUSPLUS_ALLOCA" - else - CXX="$CXX -DNO_CPLUSPLUS_ALLOCA" fi + CXXFLAGS="$CXXFLAGS -DNO_CPLUSPLUS_ALLOCA" ;; esac AC_SUBST(CC) |