* threads.m4 (CY_AC_WITH_THREADS): When using coop threads, no

need to link against libthreads; the files it used to contain
are now a part of libguile.
* aclocal.m4, configure: Rebuilt.

diff --git a/libguile/aclocal.m4 b/libguile/aclocal.m4
index 9b6ce66..7eda3e8 100644 (file)
--- a/libguile/aclocal.m4
+++ b/libguile/aclocal.m4
@@ -262,14 +262,14 @@ dnl
      if test -f $srcdir/../qt/qt.c || test -f $srcdir/qt/qt.c; then
        threads_package=COOP
        cy_cv_threads_cflags="-I$srcdir/../qt -I../qt"
-       cy_cv_threads_libs="../threads/libthreads.a ../qt/libqt.a"
+       cy_cv_threads_libs="../qt/libqt.a"
      fi
   else
      if test -f $use_threads/qt.c; then
        # FIXME seems as though we should try to use an installed qt here.
        threads_package=COOP
        cy_cv_threads_cflags="-I$use_threads -I../qt"
-       cy_cv_threads_libs="../threads/libthreads.a ../qt/libqt.a"
+       cy_cv_threads_libs="../qt/libqt.a"
      fi
   fi
   if test "$use_threads" = pthreads; then

diff --git a/libguile/configure b/libguile/configure
index e644c7d..98884ce 100755 (executable)
--- a/libguile/configure
+++ b/libguile/configure
@@ -1301,14 +1301,14 @@ if test "$use_threads" != no; then
      if test -f $srcdir/../qt/qt.c || test -f $srcdir/qt/qt.c; then
        threads_package=COOP
        cy_cv_threads_cflags="-I$srcdir/../qt -I../qt"
-       cy_cv_threads_libs="../threads/libthreads.a ../qt/libqt.a"
+       cy_cv_threads_libs="../qt/libqt.a"
      fi
   else
      if test -f $use_threads/qt.c; then
        # FIXME seems as though we should try to use an installed qt here.
        threads_package=COOP
        cy_cv_threads_cflags="-I$use_threads -I../qt"
-       cy_cv_threads_libs="../threads/libthreads.a ../qt/libqt.a"
+       cy_cv_threads_libs="../qt/libqt.a"
      fi
   fi
   if test "$use_threads" = pthreads; then
@@ -3340,6 +3340,7 @@ if test "$cy_cv_threads_package" != ""; then
 #define USE_THREADS 1
 EOF
 
+  LIBOBJS="$LIBOBJS threads.o"
 fi
 
 ## If we're using GCC, ask for aggressive warnings.
@@ -3352,7 +3353,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3356: checking for $ac_word" >&5
+echo "configure:3357: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else