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.
This commit is contained in:
Jim Blandy 1997-10-25 06:52:10 +00:00
commit 51e6b88353
4 changed files with 8 additions and 8 deletions

4
aclocal.m4 vendored
View file

@ -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

6
configure vendored
View file

@ -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

View file

@ -414,7 +414,7 @@ changequote([, ])
if $threads_enabled; then
target_libs=libqt.a
target_libs=libqthreads.a
else
target_libs=
fi

View file

@ -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