diff options
| author | Sascha Schumann <sas@php.net> | 1999-12-21 16:29:30 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 1999-12-21 16:29:30 +0000 |
| commit | 4fb1e2788fa4b8895b476e01a1803eaa316e3e41 (patch) | |
| tree | 7b3ea9e8e05735692d467fea1f3ad1f88c9fc1ca | |
| parent | 8a4170e6bde04209e0f40384f42ceec4a8b98122 (diff) | |
| download | php-git-4fb1e2788fa4b8895b476e01a1803eaa316e3e41.tar.gz | |
Improve Pthreads check
| -rw-r--r-- | TSRM/tsrm.m4 | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/TSRM/tsrm.m4 b/TSRM/tsrm.m4 index 352b4654e1..ca7a0e1066 100644 --- a/TSRM/tsrm.m4 +++ b/TSRM/tsrm.m4 @@ -12,14 +12,22 @@ AC_CHECK_HEADERS(stdarg.h) AC_DEFUN(TSRM_PTHREAD,[ -AC_CHECK_LIB(c_r, pthread_kill) -AC_CHECK_LIB(pthread, pthread_kill) +dnl Check for FreeBSD/Linux -pthread option +old_LDFLAGS="$LDFLAGS" +LDFLAGS="$LDFLAGS -pthread" AC_CHECK_FUNCS(pthread_kill) if test "$ac_cv_func_pthread_kill" != "yes"; then - AC_MSG_ERROR(You need pthreads to build TSRM.) + LDFLAGS="$old_LDFLAGS" +dnl Fall back to the standard -lpthread + AC_CHECK_LIB(pthread, pthread_kill) + unset ac_cv_func_pthread_kill + AC_CHECK_FUNCS(pthread_kill) + if test "$ac_cv_func_pthread_kill" != "yes"; then + AC_MSG_ERROR(You need Pthreads to build TSRM on UNIX.) + fi fi - + AC_DEFINE(PTHREADS, [], Whether to use Pthreads) ]) |