mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 11:40:18 +02:00
Code Activity

Get threads to work again.

Browse source 
* Makefile.am (SUBDIRS): List libguile last, so qt gets built
first.
* Makefile.in: Regenerated.
* aclocal.m4, configure: Regenerate, with modern definition of
CY_AC_WITH_THREADS.  Where did the old text come from?  Creepy...
This commit is contained in:
Jim Blandy 1997-04-24 07:32:58 +00:00
parent 2010830119
commit 42d5fe64c2
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in. ## Process this file with automake to produce Makefile.in.
SUBDIRS = libguile ice-9 qt SUBDIRS = ice-9 qt libguile
## FIXME: in the future there will be direct automake support for ## FIXME: in the future there will be direct automake support for
## doing this. When that happens, switch over. ## doing this. When that happens, switch over.

2
Makefile.in
View file

@ -69,7 +69,7 @@ qtmds_s = @qtmds_s@
target_libs = @target_libs@ target_libs = @target_libs@
xtra_PLUGIN_guile_libs = @xtra_PLUGIN_guile_libs@ xtra_PLUGIN_guile_libs = @xtra_PLUGIN_guile_libs@
SUBDIRS = libguile ice-9 qt SUBDIRS = ice-9 qt libguile
aclocaldir = $(datadir)/aclocal aclocaldir = $(datadir)/aclocal
aclocal_DATA = guile.m4 threads.m4 aclocal_DATA = guile.m4 threads.m4

4
aclocal.m4 vendored
View file

@ -250,14 +250,14 @@ dnl
if test -f $srcdir/../qt/qt.c || test -f $srcdir/qt/qt.c; then if test -f $srcdir/../qt/qt.c || test -f $srcdir/qt/qt.c; then
threads_package=COOP threads_package=COOP
cy_cv_threads_cflags="-I$srcdir/../qt -I../qt" 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 fi
else else
if test -f $use_threads/qt.c; then if test -f $use_threads/qt.c; then
# FIXME seems as though we should try to use an installed qt here. # FIXME seems as though we should try to use an installed qt here.
threads_package=COOP threads_package=COOP
cy_cv_threads_cflags="-I$use_threads -I../qt" 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
fi fi
if test "$use_threads" = pthreads; then if test "$use_threads" = pthreads; then

4
configure vendored
View file

@ -3173,14 +3173,14 @@ if test "$use_threads" != no; then
if test -f $srcdir/../qt/qt.c || test -f $srcdir/qt/qt.c; then if test -f $srcdir/../qt/qt.c || test -f $srcdir/qt/qt.c; then
threads_package=COOP threads_package=COOP
cy_cv_threads_cflags="-I$srcdir/../qt -I../qt" 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 fi
else else
if test -f $use_threads/qt.c; then if test -f $use_threads/qt.c; then
# FIXME seems as though we should try to use an installed qt here. # FIXME seems as though we should try to use an installed qt here.
threads_package=COOP threads_package=COOP
cy_cv_threads_cflags="-I$use_threads -I../qt" 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
fi fi
if test "$use_threads" = pthreads; then if test "$use_threads" = pthreads; then