From ec06dd30cfe6b3216fe919c257be92a33e454dc1 Mon Sep 17 00:00:00 2001 From: Anthony Green Date: Thu, 8 May 1997 19:14:10 +0000 Subject: [PATCH] * aclocal.m4: Fixes for building with coop threads in a seperate compilation directory. * configure: Rebuilt. --- ChangeLog | 6 ++++++ aclocal.m4 | 8 ++++---- configure | 8 ++++---- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4ff902fd0..8da4c5eee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu May 8 11:48:40 1997 Anthony Green + + * aclocal.m4: Fixes for building with coop threads in a + seperate compilation directory. + * configure: Rebuilt. + Fri May 2 16:24:15 1997 Jim Blandy Upgrade to libtool 0.9e. diff --git a/aclocal.m4 b/aclocal.m4 index a8395ab1a..509fcb1f5 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -245,11 +245,11 @@ dnl This may not necessarily be built yet - so just check for the dnl header files. dnl if test "$use_threads" = yes || test "$use_threads" = qt; then - # Look for qt in source directory. This is a hack: we look in - # "./qt" because this check might be run at the top level. - if test -f $srcdir/../qt/qt.c || test -f $srcdir/qt/qt.c; then + # Look for qt in source directory. + if test -f $srcdir/qt/qt.c; then + qtsrcdir="`(cd $srcdir; pwd)`/qt" threads_package=COOP - cy_cv_threads_cflags="-I$srcdir/../qt -I../qt" + cy_cv_threads_cflags="-I$qtsrcdir -I../qt" cy_cv_threads_libs="../qt/libqt.a" fi else diff --git a/configure b/configure index 06d1c7d5f..1579efbee 100755 --- a/configure +++ b/configure @@ -3168,11 +3168,11 @@ test -n "$use_threads" || use_threads=qt threads_package=unknown if test "$use_threads" != no; then if test "$use_threads" = yes || test "$use_threads" = qt; then - # Look for qt in source directory. This is a hack: we look in - # "./qt" because this check might be run at the top level. - if test -f $srcdir/../qt/qt.c || test -f $srcdir/qt/qt.c; then + # Look for qt in source directory. + if test -f $srcdir/qt/qt.c; then + qtsrcdir="`(cd $srcdir; pwd)`/qt" threads_package=COOP - cy_cv_threads_cflags="-I$srcdir/../qt -I../qt" + cy_cv_threads_cflags="-I$qtsrcdir -I../qt" cy_cv_threads_libs="../qt/libqt.a" fi else -- 2.20.1