diff options
author | monty@narttu.mysql.fi <> | 2003-05-14 22:08:30 +0300 |
---|---|---|
committer | monty@narttu.mysql.fi <> | 2003-05-14 22:08:30 +0300 |
commit | cf99d899084c47d248d42cb38be522321a9806e1 (patch) | |
tree | 1b86b1b59747e690a210f1095901e5b1fef0dbf2 | |
parent | 39861469e5c9753519308cb9a26e21806f98ed4f (diff) | |
download | mariadb-git-cf99d899084c47d248d42cb38be522321a9806e1.tar.gz |
Portability fixes OpenUnix 8 & UnixWare 7.1.x
-rw-r--r-- | acinclude.m4 | 3 | ||||
-rw-r--r-- | configure.in | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 83cc01cc127..e0b28874892 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1165,7 +1165,8 @@ m4_define([_AC_PROG_CXX_EXIT_DECLARATION], 'extern "C" void std::exit (int); using std::exit;' \ 'extern "C" void exit (int) throw ();' \ 'extern "C" void exit (int);' \ - 'void exit (int);' + 'void exit (int);' \ + '#include <stdlib.h>' do _AC_COMPILE_IFELSE([AC_LANG_PROGRAM([@%:@include <stdlib.h> $ac_declaration], diff --git a/configure.in b/configure.in index cc6f3a79b69..5b690c3af78 100644 --- a/configure.in +++ b/configure.in @@ -1170,10 +1170,8 @@ then with_named_thread="-Kthread -lsocket -lnsl" if expr "$SYSTEM_TYPE" : ".*unixware7.0.0" > /dev/null then -# AC_DEFINE(HAVE_OpenUNIX8_THREADS) AC_DEFINE(HAVE_UNIXWARE7_THREADS) else -# AC_DEFINE(HAVE_OpenUNIX8_POSIX) AC_DEFINE(HAVE_UNIXWARE7_POSIX) fi # We must have cc @@ -1182,10 +1180,8 @@ then then { echo "configure: error: On OpenUNIX8 and UnixWare7 MySQL must be compiled with cc. See the Installation chapter in the Reference Manual." 1>&2; exit 1; }; else -# CC="$CC -Kthread -DOpenUNIX8"; -# CXX="$CXX -Kthread -DOpenUNIX8"; - CC="$CC -Kthread -DUNIXWARE_7"; - CXX="$CXX -Kthread -DUNIXWARE_7"; + CC="$CC -Kthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK"; + CXX="$CXX -Kthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK"; fi AC_MSG_RESULT("yes") else |