Call the QuickThreads library libqthreads.a, not libqt.a. The old

name conflicts with the Qt user interface toolkit.
* threads.m4 (CY_AC_WITH_THREADS): Use new library name.
* configure.in: Same.
* aclocal.m4, configure: Regenerated.

diff --git a/aclocal.m4 b/aclocal.m4
index c42a31f..f417fce 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -453,14 +453,14 @@ dnl
        qtsrcdir="`(cd $srcdir; pwd)`/qt"
        threads_package=COOP
        cy_cv_threads_cflags="-I$qtsrcdir -I../qt"
-       cy_cv_threads_libs="../qt/libqt.a"
+       cy_cv_threads_libs="../qt/libqthreads.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="../qt/libqt.a"
+       cy_cv_threads_libs="../qt/libqthreads.a"
      fi
   fi
   if test "$use_threads" = pthreads; then

diff --git a/configure b/configure
index de74906..3c6cc7b 100755 (executable)
--- a/configure
+++ b/configure
@@ -3968,14 +3968,14 @@ if test "$use_threads" != no; then
        qtsrcdir="`(cd $srcdir; pwd)`/qt"
        threads_package=COOP
        cy_cv_threads_cflags="-I$qtsrcdir -I../qt"
-       cy_cv_threads_libs="../qt/libqt.a"
+       cy_cv_threads_libs="../qt/libqthreads.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="../qt/libqt.a"
+       cy_cv_threads_libs="../qt/libqthreads.a"
      fi
   fi
   if test "$use_threads" = pthreads; then
@@ -4258,7 +4258,7 @@ esac
 
 
 if $threads_enabled; then
-   target_libs=libqt.a
+   target_libs=libqthreads.a
 else
    target_libs=
 fi

diff --git a/configure.in b/configure.in
index 01afc75..d54d616 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -414,7 +414,7 @@ changequote([, ])
 
 
 if $threads_enabled; then
-   target_libs=libqt.a
+   target_libs=libqthreads.a
 else
    target_libs=
 fi

diff --git a/threads.m4 b/threads.m4
index 16d3bf1..a803989 100644 (file)
--- a/threads.m4
+++ b/threads.m4
@@ -25,14 +25,14 @@ dnl
        qtsrcdir="`(cd $srcdir; pwd)`/qt"
        threads_package=COOP
        cy_cv_threads_cflags="-I$qtsrcdir -I../qt"
-       cy_cv_threads_libs="../qt/libqt.a"
+       cy_cv_threads_libs="../qt/libqthreads.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="../qt/libqt.a"
+       cy_cv_threads_libs="../qt/libqthreads.a"
      fi
   fi
   if test "$use_threads" = pthreads; then