mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-03-01 14:15:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update pthread checks:

Browse Source 
Add plain -lpthread check.
	Move *_r() checks so that they are checked for regradless
		of thread libs used.  Before they were only being checked
		when using threads.
	Fix yields test such that compile/link/odd runtime failures results in
		'yes' instead of 'no'.
This commit is contained in:
Kurt Zeilenga 1998-12-14 00:23:22 +00:00
parent f8aee573d6
commit 9db062bb71
3 changed files with 406 additions and 341 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

689
configure vendored
View File

File diff suppressed because it is too large Load Diff

55
configure.in
View File

@ -485,6 +485,15 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
LIBS="$save_LIBS"
fi
if test $ol_link_threads = no ; then
dnl try -lpthreads
save_LIBS="$LIBS"
AC_CHECK_LIB(pthreads, pthread_create, [
ol_link_threads=posix
LTHREAD_LIBS="$LTHREAD_LIBS -lpthreads"])
LIBS="$save_LIBS"
fi
if test $ol_link_threads != no ; then
AC_DEFINE(HAVE_PTHREADS)
@ -602,10 +611,10 @@ static void *task(p)
if(i < 0) {
perror("select");
exit(0);
exit(10);
}
exit(1); /* if we exit here, the select blocked the whole process */
exit(0); /* if we exit here, the select blocked the whole process */
}
int main(argc, argv)
@ -617,7 +626,7 @@ int main(argc, argv)
/* create a pipe to select */
if(pipe(&fildes[0])) {
perror("select");
exit(0);
exit(1);
}
#ifdef HAVE_PTHREAD_SETCONCURRENCY
@ -638,10 +647,11 @@ int main(argc, argv)
pthread_yield(); /* make sure task runs first */
#endif
#endif
exit(0);
exit(2);
}],
[ol_cv_pthread_select_yields=yes],
[ol_cv_pthread_select_yields=no], [
[ol_cv_pthread_select_yields=no],
[ol_cv_pthread_select_yields=yes], [
AC_MSG_ERROR([crossing compiling: use --with-yielding_select=yes|no|manual])])])
AC_MSG_RESULT($ol_cv_pthread_select_yields)
@ -650,20 +660,6 @@ int main(argc, argv)
fi
fi
dnl check for reentrant/threadsafe functions
dnl
dnl note: these should only be used when linking
dnl with $LTHREAD_LIBS
dnl
AC_CHECK_FUNCS( \
strtok_r \
gmtime_r \
gethostbyaddr_r gethostbyname_r \
feof_unlocked unlocked_feof \
putc_unlocked unlocked_putc \
flockfile ftrylockfile \
)
dnl restore flags
CPPFLAGS="$save_CPPFLAGS"
LIBS="$save_LIBS"
@ -806,6 +802,25 @@ int x = errno;
LIBS="$LTHREAD_LIBS $LIBS"
LTHREAD_LIBS=""
fi
dnl check for reentrant/threadsafe functions
dnl
dnl note: these should only be used when linking
dnl with $LTHREAD_LIBS
dnl
save_CPPFLAGS="$CPPFLAGS"
save_LIBS="$LIBS"
LIBS="$LTHREAD_LIBS $LIBS"
AC_CHECK_FUNCS( \
strtok_r \
gmtime_r \
gethostbyaddr_r gethostbyname_r \
feof_unlocked unlocked_feof \
putc_unlocked unlocked_putc \
flockfile ftrylockfile \
)
CPPFLAGS="$save_CPPFLAGS"
LIBS="$save_LIBS"
fi
dnl ----------------------------------------------------------------

3
include/portable.h.in
View File

@ -279,9 +279,6 @@ is provided ``as is'' without express or implied warranty.
/* Define if you have the bcopy function. */
#undef HAVE_BCOPY
/* Define if you have the des_string_to_key function. */
#undef HAVE_DES_STRING_TO_KEY
/* Define if you have the feof_unlocked function. */
#undef HAVE_FEOF_UNLOCKED