diff options
| author | unknown <serg@serg.mysql.com> | 2000-10-07 14:05:45 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2000-10-07 14:05:45 +0200 |
| commit | 4af074054be434b73e3b449ca1babc982c4df5fb (patch) | |
| tree | 86bb72189b916c14b9798287d813f4bac77dfb14 /configure.in | |
| parent | c286021a376e4111a63d21b653232f80993f201b (diff) | |
| parent | aaea3431d33c9b66c6b01a31ffcd4e85a28800ee (diff) | |
| download | mariadb-git-4af074054be434b73e3b449ca1babc982c4df5fb.tar.gz | |
Merge
configure.in:
merged
BitKeeper/etc/logging_ok:
Auto merged
sql/filesort.cc:
merged
sql/sql_select.cc:
merged
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/configure.in b/configure.in index e8a112b8d6d..77f9d84d883 100644 --- a/configure.in +++ b/configure.in @@ -332,7 +332,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") @@ -620,6 +626,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 @@ -675,6 +682,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" @@ -1013,7 +1029,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="" @@ -1186,7 +1202,8 @@ AC_SUBST(MAKE_SHELL) # Already-done: stdlib.h string.h unistd.h termios.h AC_CHECK_HEADERS(varargs.h stdarg.h dirent.h locale.h ndir.h sys/dir.h \ sys/file.h sys/ndir.h sys/ptem.h sys/pte.h sys/select.h sys/stream.h \ - sys/mman.h curses.h termcap.h termio.h termbits.h asm/termbits.h grp.h) + sys/mman.h curses.h termcap.h termio.h termbits.h asm/termbits.h grp.h \ +paths.h) # Already-done: strcasecmp AC_CHECK_FUNCS(lstat putenv select setenv setlocale strcoll tcgetattr) @@ -1222,7 +1239,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 \ |