Commit 0de12b5c authored by kent@kent-amd64.(none)'s avatar kent@kent-amd64.(none)

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build

into  mysql.com:/home/kent/bk/build/mysql-5.1-build
parents 46703ed2 8ed5fb5a
...@@ -188,7 +188,7 @@ CC_VERSION=`$CC --version | sed 1q` ...@@ -188,7 +188,7 @@ CC_VERSION=`$CC --version | sed 1q`
esac esac
if test $? -eq "0" if test $? -eq "0"
then then
AC_MSG_CHECKING("C Compiler version"); AC_MSG_CHECKING("C Compiler version")
AC_MSG_RESULT("$CC $CC_VERSION") AC_MSG_RESULT("$CC $CC_VERSION")
else else
CC_VERSION="" CC_VERSION=""
...@@ -1296,7 +1296,7 @@ See the Installation chapter in the Reference Manual for more information.]) ...@@ -1296,7 +1296,7 @@ See the Installation chapter in the Reference Manual for more information.])
AC_MSG_RESULT("no need to check headers") AC_MSG_RESULT("no need to check headers")
fi fi
AC_MSG_CHECKING("for pthread_create in -lpthread"); AC_MSG_CHECKING("for pthread_create in -lpthread")
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="$LIBS -lpthread" LIBS="$LIBS -lpthread"
AC_TRY_LINK( [#include <pthread.h>], AC_TRY_LINK( [#include <pthread.h>],
...@@ -1356,7 +1356,7 @@ then ...@@ -1356,7 +1356,7 @@ then
then then
AC_MSG_RESULT("yes") AC_MSG_RESULT("yes")
else else
AC_MSG_ERROR([On SCO UNIX MySQL must be compiled with gcc. See the Installation chapter in the Reference Manual.]); AC_MSG_ERROR([On SCO UNIX MySQL must be compiled with gcc. See the Installation chapter in the Reference Manual.])
fi fi
AC_MSG_RESULT("yes") AC_MSG_RESULT("yes")
elif test -f /usr/local/lib/libpthread.a -o -f /usr/local/lib/libpthread.so elif test -f /usr/local/lib/libpthread.a -o -f /usr/local/lib/libpthread.so
...@@ -1372,7 +1372,7 @@ then ...@@ -1372,7 +1372,7 @@ then
then then
AC_MSG_RESULT("yes") AC_MSG_RESULT("yes")
else else
AC_MSG_ERROR([On SCO UNIX MySQL must be compiled with gcc. See the Installation chapter in the Reference Manual.]); AC_MSG_ERROR([On SCO UNIX MySQL must be compiled with gcc. See the Installation chapter in the Reference Manual.])
fi fi
AC_MSG_RESULT("yes") AC_MSG_RESULT("yes")
# Hack for SCO UnixWare 7.1.x # Hack for SCO UnixWare 7.1.x
...@@ -1517,7 +1517,7 @@ else ...@@ -1517,7 +1517,7 @@ else
AC_MSG_RESULT("$with_posix_threads") AC_MSG_RESULT("$with_posix_threads")
if test "$with_posix_threads" = "no" if test "$with_posix_threads" = "no"
then then
AC_MSG_CHECKING("for pthread_create in -lpthread"); AC_MSG_CHECKING("for pthread_create in -lpthread")
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="$LIBS -lpthread" LIBS="$LIBS -lpthread"
CLIENT_THREAD_LIBS="-lpthread" CLIENT_THREAD_LIBS="-lpthread"
...@@ -1530,7 +1530,7 @@ else ...@@ -1530,7 +1530,7 @@ else
then then
LIBS=" $ac_save_LIBS -lpthreads" LIBS=" $ac_save_LIBS -lpthreads"
CLIENT_THREAD_LIBS="-lpthreads" CLIENT_THREAD_LIBS="-lpthreads"
AC_MSG_CHECKING("for pthread_create in -lpthreads"); AC_MSG_CHECKING("for pthread_create in -lpthreads")
AC_TRY_LINK( AC_TRY_LINK(
[#include <pthread.h>], [#include <pthread.h>],
[ pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); ], [ pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); ],
...@@ -1541,7 +1541,7 @@ else ...@@ -1541,7 +1541,7 @@ else
# This is for FreeBSD # This is for FreeBSD
LIBS="$ac_save_LIBS -pthread" LIBS="$ac_save_LIBS -pthread"
CLIENT_THREAD_LIBS="-pthread" CLIENT_THREAD_LIBS="-pthread"
AC_MSG_CHECKING("for pthread_create in -pthread"); AC_MSG_CHECKING("for pthread_create in -pthread")
AC_TRY_LINK( AC_TRY_LINK(
[#include <pthread.h>], [#include <pthread.h>],
[ pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); ], [ pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); ],
...@@ -1915,7 +1915,7 @@ if test "$ac_cv_conv_longlong_to_float" != "yes" ...@@ -1915,7 +1915,7 @@ if test "$ac_cv_conv_longlong_to_float" != "yes"
then then
AC_MSG_ERROR([Your compiler cannot convert a longlong value to a float! AC_MSG_ERROR([Your compiler cannot convert a longlong value to a float!
If you are using gcc 2.8.# you should upgrade to egcs 1.0.3 or newer and try If you are using gcc 2.8.# you should upgrade to egcs 1.0.3 or newer and try
again]); again])
fi fi
fi fi
AC_CHECK_TYPES([sigset_t, off_t], [], [], [#include <sys/types.h>]) AC_CHECK_TYPES([sigset_t, off_t], [], [], [#include <sys/types.h>])
...@@ -2079,7 +2079,7 @@ CFLAGS="$ORG_CFLAGS" ...@@ -2079,7 +2079,7 @@ CFLAGS="$ORG_CFLAGS"
AC_CHECK_FUNC(fseeko, AC_CHECK_FUNC(fseeko,
[if test "$large_file_support" = no -a "$TARGET_LINUX" = "true"; [if test "$large_file_support" = no -a "$TARGET_LINUX" = "true";
then then
AC_MSG_ERROR("Found fseeko symbol but large_file_support is not enabled!"); AC_MSG_ERROR("Found fseeko symbol but large_file_support is not enabled!")
fi] fi]
) )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment