summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--configure.in7
-rw-r--r--test-suite/ChangeLog6
-rw-r--r--test-suite/standalone/Makefile.am11
4 files changed, 28 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 12649dc9f..598fb177f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2008-04-26 Ludovic Courtès <ludo@gnu.org>
+ * configure.in (BUILD_PTHREAD_SUPPORT): New Automake
+ conditional.
+
+2008-04-26 Ludovic Courtès <ludo@gnu.org>
+
* Makefile.am (EXTRA_DIST): Remove `ANON-CVS' and `SNAPSHOTS'.
2008-02-23 Neil Jerram <neil@ossau.uklinux.net>
diff --git a/configure.in b/configure.in
index 193d6a6c2..fcfe2bf79 100644
--- a/configure.in
+++ b/configure.in
@@ -1166,6 +1166,9 @@ AC_SUBST(SCM_I_GSC_NEED_BRACES_ON_PTHREAD_MUTEX_INITIALIZER, 0)
case "$with_threads" in
"yes" | "pthread" | "pthreads" | "pthread-threads" | "")
+
+ build_pthread_support="yes"
+
ACX_PTHREAD(CC="$PTHREAD_CC"
LIBS="$PTHREAD_LIBS $LIBS"
SCM_I_GSC_USE_PTHREAD_THREADS=1
@@ -1245,6 +1248,10 @@ esac
AC_MSG_CHECKING(what kind of threads to support)
AC_MSG_RESULT($with_threads)
+AM_CONDITIONAL([BUILD_PTHREAD_SUPPORT],
+ [test "x$build_pthread_support" = "xyes"])
+
+
## Check whether pthread_attr_getstack works for the main thread
if test "$with_threads" = pthreads; then
diff --git a/test-suite/ChangeLog b/test-suite/ChangeLog
index f3c075c4d..fa0fb7821 100644
--- a/test-suite/ChangeLog
+++ b/test-suite/ChangeLog
@@ -1,5 +1,11 @@
2008-04-26 Ludovic Courtès <ludo@gnu.org>
+ * standalone/Makefile.am (TESTS): Only add
+ `test-with-guile-module' when `BUILD_PTHREAD_SUPPORT' is true.
+ Reported by Alain Guibert <alguibert+bts@free.fr>.
+
+2008-04-26 Ludovic Courtès <ludo@gnu.org>
+
* tests/srfi-35.test (cond-expand): New test.
2008-04-26 Ludovic Courtès <ludo@gnu.org>
diff --git a/test-suite/standalone/Makefile.am b/test-suite/standalone/Makefile.am
index bafe0c711..ae68d5fe1 100644
--- a/test-suite/standalone/Makefile.am
+++ b/test-suite/standalone/Makefile.am
@@ -26,6 +26,7 @@ noinst_LTLIBRARIES =
check_PROGRAMS =
check_SCRIPTS =
BUILT_SOURCES =
+EXTRA_DIST =
TESTS_ENVIRONMENT = "${top_builddir}/pre-inst-guile-env"
@@ -113,13 +114,21 @@ TESTS += test-conversion
check_SCRIPTS += test-use-srfi
TESTS += test-use-srfi
+if BUILD_PTHREAD_SUPPORT
+
# test-with-guile-module
test_with_guile_module_CFLAGS = ${test_cflags}
test_with_guile_module_LDADD = ${top_builddir}/libguile/libguile.la
check_PROGRAMS += test-with-guile-module
TESTS += test-with-guile-module
+else
+
+EXTRA_DIST += test-with-guile-module.c
+
+endif
+
all-local:
cd ${srcdir} && chmod u+x ${check_SCRIPTS}
-EXTRA_DIST = ${check_SCRIPTS}
+EXTRA_DIST += ${check_SCRIPTS}