diff options
author | unknown <serg@serg.mylan> | 2004-11-28 20:42:04 +0100 |
---|---|---|
committer | unknown <serg@serg.mylan> | 2004-11-28 20:42:04 +0100 |
commit | 8b244fc665efa74d4aa95fd1910680327dc779bf (patch) | |
tree | 73ac6d40766844cf3ca373cf0b7e4edf0a7a5be0 /configure.in | |
parent | 4c9c3f32de96fd9a35ee1a9337dab1da6f99fddb (diff) | |
parent | 1b898a22460a369b8ca21f573973a8a0518e85d4 (diff) | |
download | mariadb-git-8b244fc665efa74d4aa95fd1910680327dc779bf.tar.gz |
merged
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
mysql-test/r/rpl_start_stop_slave.result:
Auto merged
scripts/mysql_fix_privilege_tables.sh:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_func.h:
Auto merged
sql/slave.cc:
Auto merged
mysql-test/r/select.result:
!bk-eb
mysql-test/t/select.test:
!bk-eb
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/configure.in b/configure.in index f6dd9c56b20..d3385fc425b 100644 --- a/configure.in +++ b/configure.in @@ -1933,9 +1933,11 @@ AC_CHECK_FUNCS(alarm bcmp bfill bmove bzero chsize cuserid fchmod fcntl \ # # case "$target" in - *-*-aix4*) + *-*-aix4* | *-*-sco*) # (grr) aix 4.3 has a stub for clock_gettime, (returning ENOSYS) # and using AC_TRY_RUN is hard when cross-compiling + # We also disable for SCO for the time being, the headers for the + # thread library we use conflicts with other headers. ;; *) AC_CHECK_FUNCS(clock_gettime) ;; |