diff options
| author | Christoffer Hall <hall@mysql.com> | 2009-06-29 14:55:22 +0200 |
|---|---|---|
| committer | Christoffer Hall <hall@mysql.com> | 2009-06-29 14:55:22 +0200 |
| commit | eaf50ced6dee048ddd015b15699ceda378e7ab91 (patch) | |
| tree | 6869d5dc64d53354c2c80446370db89b377e0463 /configure.in | |
| parent | 77fb9608a975ada6ec44d7dfb875967ecdac06a6 (diff) | |
| parent | ccb1183887b939c7d17ca333e8f3899b68a0decd (diff) | |
| download | mariadb-git-eaf50ced6dee048ddd015b15699ceda378e7ab91.tar.gz | |
Merge from main branch
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/configure.in b/configure.in index 33ac021ec76..d68a4121642 100644 --- a/configure.in +++ b/configure.in @@ -10,7 +10,7 @@ AC_CANONICAL_SYSTEM # # When changing major version number please also check switch statement # in mysqlbinlog::check_master_version(). -AM_INIT_AUTOMAKE(mysql, 5.1.36) +AM_INIT_AUTOMAKE(mysql, 5.1.37) AM_CONFIG_HEADER([include/config.h:config.h.in]) PROTOCOL_VERSION=10 @@ -1625,7 +1625,7 @@ esac # Build optimized or debug version ? # First check for gcc and g++ -if test "$ac_cv_prog_gcc" = "yes" +if test "$GCC" = "yes" then DEBUG_CFLAGS="-g" DEBUG_OPTIMIZE_CC="-O" @@ -1633,9 +1633,16 @@ then else DEBUG_CFLAGS="-g" DEBUG_OPTIMIZE_CC="" - OPTIMIZE_CFLAGS="-O" + case $SYSTEM_TYPE in + *solaris*) + OPTIMIZE_CFLAGS="-O1" + ;; + *) + OPTIMIZE_CFLAGS="-O" + ;; + esac fi -if test "$ac_cv_prog_cxx_g" = "yes" +if test "$GXX" = "yes" then DEBUG_CXXFLAGS="-g" DEBUG_OPTIMIZE_CXX="-O" @@ -1643,7 +1650,14 @@ then else DEBUG_CXXFLAGS="-g" DEBUG_OPTIMIZE_CXX="" - OPTIMIZE_CXXFLAGS="-O" + case $SYSTEM_TYPE in + *solaris*) + OPTIMIZE_CXXFLAGS="-O1" + ;; + *) + OPTIMIZE_CXXFLAGS="-O" + ;; + esac fi case $SYSTEM_TYPE in |