diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-12-20 14:59:35 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-12-20 14:59:35 +0200 |
| commit | ede01c2b208e03bdbe114cb96a054c18be299219 (patch) | |
| tree | dfd4f17c50dbd8347e096acf8bc42ffe1aade3ae /configure.in | |
| parent | 63c9b06a62c80cb8889ad753d73bcd0c759c0632 (diff) | |
| parent | 791e9fb37ea10f3e91e56e15c869906d90313c06 (diff) | |
| download | mariadb-git-ede01c2b208e03bdbe114cb96a054c18be299219.tar.gz | |
Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0
configure.in:
Auto merged
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 70c6ae08a30..f35b9fa7da9 100644 --- a/configure.in +++ b/configure.in @@ -135,13 +135,19 @@ if test $? -eq "0" then AC_MSG_CHECKING("C Compiler version"); AC_MSG_RESULT("$CC $CC_VERSION") +else +CC_VERSION="" fi CXX_VERSION=`$CXX --version` if test $? -eq "0" then AC_MSG_CHECKING("C++ compiler version"); AC_MSG_RESULT("$CXX $CXX_VERSION") +else +CXX_VERSION="" fi +AC_SUBST(CXX_VERSION) +AC_SUBST(CC_VERSION) # Fix for sgi gcc / sgiCC which tries to emulate gcc if test "$CC" = "sgicc" @@ -1228,7 +1234,7 @@ then # CC="$CC -Kthread -DOpenUNIX8"; # CXX="$CXX -Kthread -DOpenUNIX8"; CC="$CC -Kthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK"; - CXX="$CXX -Kthread -DUNIXWARE_7"; + CXX="$CXX -Kthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK" fi AC_MSG_RESULT("yes") else |