diff options
| author | sasha@mysql.sashanet.com <> | 2001-05-10 15:06:35 -0600 |
|---|---|---|
| committer | sasha@mysql.sashanet.com <> | 2001-05-10 15:06:35 -0600 |
| commit | 7c9b9f471c86c53f8a55ec4a249499cf2fb6bab3 (patch) | |
| tree | 32fd0eb2c34334b7806726cf2dc9f8a893ea6fc8 /acinclude.m4 | |
| parent | 8e882bcafa9daf15f77718f29ab8cdc344e4ee27 (diff) | |
| parent | 4e04aa4abd0e540e6ce5cd48f2057ae993ee3336 (diff) | |
| download | mariadb-git-7c9b9f471c86c53f8a55ec4a249499cf2fb6bab3.tar.gz | |
Merged with 3.23, needs further fix-up
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 40 |
1 files changed, 39 insertions, 1 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 412bfd55470..2f07a29023f 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -196,6 +196,42 @@ then fi ]) + +AC_DEFUN(MYSQL_PTHREAD_YIELD, +[AC_CACHE_CHECK([if pthread_yield takes zero arguments], ac_cv_pthread_yield_zero_arg, +[AC_TRY_LINK([#define _GNU_SOURCE +#include <pthread.h> +#ifdef __cplusplus +extern "C" +#endif +], +[ + pthread_yield(); +], ac_cv_pthread_yield_zero_arg=yes, ac_cv_pthread_yield_zero_arg=yeso)]) +if test "$ac_cv_pthread_yield_zero_arg" = "yes" +then + AC_DEFINE(HAVE_PTHREAD_YIELD_ZERO_ARG) +fi +] +[AC_CACHE_CHECK([if pthread_yield takes 1 argument], ac_cv_pthread_yield_one_arg, +[AC_TRY_LINK([#define _GNU_SOURCE +#include <pthread.h> +#ifdef __cplusplus +extern "C" +#endif +], +[ + pthread_yield(0); +], ac_cv_pthread_yield_one_arg=yes, ac_cv_pthread_yield_one_arg=no)]) +if test "$ac_cv_pthread_yield_one_arg" = "yes" +then + AC_DEFINE(HAVE_PTHREAD_YIELD_ONE_ARG) +fi +] +) + + + #---END: AC_DEFUN(MYSQL_CHECK_FP_EXCEPT, @@ -514,7 +550,8 @@ AC_DEFUN(MYSQL_STACK_DIRECTION, AC_DEFUN(MYSQL_FUNC_ALLOCA, [ -# Since we have heard that alloca fails on IRIX never define it on a SGI machine +# Since we have heard that alloca fails on IRIX never define it on a +# SGI machine if test ! "$host_vendor" = "sgi" then AC_REQUIRE_CPP()dnl Set CPP; we run AC_EGREP_CPP conditionally. @@ -941,6 +978,7 @@ dnl circular references. ../innobase/odbc/libodbc.a\ ../innobase/srv/libsrv.a\ ../innobase/que/libque.a\ + ../innobase/srv/libsrv.a\ ../innobase/dict/libdict.a\ ../innobase/ibuf/libibuf.a\ ../innobase/row/librow.a\ |