Changed logic in thread support configuration such that
--with-threads=no is equivalent to --with-threads=null. On platforms that are not supported by QuickThreads, we also use the null-threads. Thus, USE_THREADS is always defined now.
This commit is contained in:
parent
64e00566db
commit
585356dcbd
1 changed files with 35 additions and 41 deletions
28
configure.in
28
configure.in
|
|
@ -638,14 +638,13 @@ AC_ARG_WITH(threads, [ --with-threads thread interface],
|
|||
|
||||
### Turn $with_threads into either the name of a threads package, like
|
||||
### `qt', or `no', meaning that threads should not be supported.
|
||||
AC_MSG_CHECKING(whether to support threads)
|
||||
AC_MSG_CHECKING(what kind of threads to support)
|
||||
case "$with_threads" in
|
||||
"yes" | "qt" | "coop" | "")
|
||||
with_threads=qt
|
||||
;;
|
||||
"null" )
|
||||
;;
|
||||
"no" )
|
||||
"no" | "null")
|
||||
with_threads=null
|
||||
;;
|
||||
* )
|
||||
AC_MSG_ERROR(invalid value for --with-threads: $with_threads)
|
||||
|
|
@ -659,7 +658,7 @@ case "${with_threads}" in
|
|||
"qt" )
|
||||
## This configures the QuickThreads package, and sets or clears
|
||||
## the THREAD_PACKAGE variable if qthreads don't configure
|
||||
## correctly.
|
||||
## correctly. In that case, we fall back on null-threads.
|
||||
QTHREADS_CONFIGURE
|
||||
;;
|
||||
"null" )
|
||||
|
|
@ -667,17 +666,13 @@ case "${with_threads}" in
|
|||
;;
|
||||
esac
|
||||
|
||||
## We always provide the thread API now and thus, USE_THREADS is
|
||||
## always defined and threads.o is always included.
|
||||
|
||||
## If we're using threads, bring in some other parts of Guile which
|
||||
## work with them.
|
||||
if test "${THREAD_PACKAGE}" != "" ; then
|
||||
AC_DEFINE(USE_THREADS, 1, [Define if providing the thread API.])
|
||||
AC_DEFINE(USE_THREADS, 1, [Define if providing the thread API.])
|
||||
AC_LIBOBJ([threads])
|
||||
|
||||
## Include the Guile thread interface in the library...
|
||||
AC_LIBOBJ([threads])
|
||||
|
||||
## ... and tell it which package to talk to.
|
||||
case "${THREAD_PACKAGE}" in
|
||||
case "${THREAD_PACKAGE}" in
|
||||
"QT" )
|
||||
AC_DEFINE(USE_COOP_THREADS, 1,
|
||||
[Define if using cooperative multithreading.])
|
||||
|
|
@ -700,16 +695,15 @@ if test "${THREAD_PACKAGE}" != "" ; then
|
|||
fi
|
||||
|
||||
;;
|
||||
"null" )
|
||||
"null" | "" )
|
||||
AC_DEFINE(USE_NULL_THREADS, 1,
|
||||
[Define if using one-thread 'multi'threading.])
|
||||
;;
|
||||
* )
|
||||
AC_MSG_ERROR(invalid value for THREAD_PACKAGE: ${THREAD_PACKAGE})
|
||||
;;
|
||||
esac
|
||||
esac
|
||||
|
||||
fi
|
||||
|
||||
## Cross building
|
||||
if test "$cross_compiling" = "yes"; then
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue