diff options
author | unknown <monty@donna.mysql.com> | 2000-10-04 23:20:16 +0300 |
---|---|---|
committer | unknown <monty@donna.mysql.com> | 2000-10-04 23:20:16 +0300 |
commit | fc78fef7968a652d2bf96ac5ee6d5f35faf7fcd9 (patch) | |
tree | f355b0229e2ae229e8311da676b61658f1b0a052 /configure.in | |
parent | 63b7b45ff7f79a08a673e8b759a69f5ee7e67902 (diff) | |
download | mariadb-git-fc78fef7968a652d2bf96ac5ee6d5f35faf7fcd9.tar.gz |
Portability fixes
Docs/manual.texi:
Updates in the links sections
config.guess:
Added fixes for Darwin
config.sub:
Added fixes for Darwin
configure.in:
Added fixes for Darwin
extra/my_print_defaults.c:
Fixed typo
include/my_pthread.h:
Added fixes for Darwin
ltconfig:
Portability fix
myisam/mi_check.c:
Make myisamchk more silent
mysys/Makefile.am:
Added mf_tempfile.c
mysys/mf_cache.c:
Remove not used parts
mysys/mf_tempfile.c:
Fix for Solaris
sql/log.cc:
Fix for Windows
sql/sql_cache.cc:
Fix for Darwin
sql/sql_show.cc:
Fix for temporary tables
strings/strtol.c:
Fix for Darwin
support-files/mysql.spec.sh:
Fix for documentation files that are installed compressed
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/configure.in b/configure.in index 394b4f83a89..1842ac5d2fc 100644 --- a/configure.in +++ b/configure.in @@ -331,7 +331,13 @@ elif $PS $$ 2> /dev/null | grep $0 > /dev/null then FIND_PROC="$PS \$\$PID | grep mysqld > /dev/null" else - AC_MSG_ERROR([Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual.]) + case $SYSTEM_TYPE in + *darwin*) + FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" + ;; + *) + AC_MSG_ERROR([Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual.]) + esac fi AC_SUBST(FIND_PROC) AC_MSG_RESULT("$FIND_PROC") @@ -619,6 +625,7 @@ int main() # Some system specific hacks # +MAX_C_OPTIMIZE="-O6" case $SYSTEM_TYPE in *solaris2.7*) # Solaris 2.7 has a broken /usr/include/widec.h @@ -674,6 +681,15 @@ case $SYSTEM_TYPE in fi fi ;; + *darwin*) + if test "$ac_cv_prog_gcc" = "yes" + then + CFLAGS="$CFLAGS -traditional-cpp -DHAVE_DARWIN_THREADS" + CXXFLAGS="$CXXFLAGS -traditional-cpp -DHAVE_DARWIN_THREADS" + MAX_C_OPTIMIZE="-O" + with_named_curses="" + fi + ;; *freebsd*) echo "Adding fix for interrupted reads" CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000" @@ -1012,7 +1028,7 @@ if test "$ac_cv_prog_gcc" = "yes" then DEBUG_CFLAGS="-g" DEBUG_OPTIMIZE_CC="-O" - OPTIMIZE_CFLAGS="-O6" + OPTIMIZE_CFLAGS="$MAX_C_OPTIMIZE" else DEBUG_CFLAGS="-g" DEBUG_OPTIMIZE_CC="" @@ -1221,7 +1237,7 @@ AC_CHECK_FUNCS(alarm bmove \ getrusage getpwuid getcwd getrlimit getwd index stpcpy locking longjmp \ perror pread realpath rename \ socket strnlen madvise \ - strtoul strtoull snprintf tempnam thr_setconcurrency \ + strtol strtoul strtoull snprintf tempnam thr_setconcurrency \ gethostbyaddr_r gethostbyname_r getpwnam \ bfill bzero bcmp strstr strpbrk strerror\ tell atod memcpy memmove \ |