diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-05-14 22:28:54 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-05-14 22:28:54 +0300 |
| commit | 6ea284dc3f2f519760ad062984cdc10e45c212a8 (patch) | |
| tree | 3e8abab8ec454527f98c80c9e2f19b5a81a5ff1f /configure.in | |
| parent | 4efbc40a13c8b7d442b1e51b03142b2bd4e0fd27 (diff) | |
| parent | 3e52a3f1fc2b1c65e9f08b66f10056312ce363e1 (diff) | |
| download | mariadb-git-6ea284dc3f2f519760ad062984cdc10e45c212a8.tar.gz | |
Merge with 3.23 (No releavant code changes)
acinclude.m4:
Auto merged
configure.in:
Merge with 3.23
innobase/os/os0sync.c:
No change
sql/sql_show.cc:
No change
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 3b00f5343ce..c7cf4f66b70 100644 --- a/configure.in +++ b/configure.in @@ -1369,10 +1369,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 @@ -1381,10 +1379,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 -DHAVE_BROKEN_RWLOCK"; - CXX="$CXX -Kthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK" + CC="$CC -Kthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK"; + CXX="$CXX -Kthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK"; fi AC_MSG_RESULT("yes") else |