diff --git a/configure.ac b/configure.ac
index 5c70aa8b0..69f35e278 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,8 @@ dnl
 
 define(GUILE_CONFIGURE_COPYRIGHT,[[
 
-Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+  2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 This file is part of GUILE
 
@@ -75,6 +76,8 @@ AM_PROG_CC_C_O
 AC_LIBTOOL_DLOPEN
 AC_PROG_LIBTOOL
 
+AM_CONDITIONAL([HAVE_SHARED_LIBRARIES], [test "x$enable_shared" = "xyes"])
+
 dnl Check for libltdl.
 AC_LIB_HAVE_LINKFLAGS([ltdl], [], [#include <ltdl.h>],
   [lt_dlopenext ("foo");])
diff --git a/test-suite/standalone/Makefile.am b/test-suite/standalone/Makefile.am
index e3b5a3888..861e668b6 100644
--- a/test-suite/standalone/Makefile.am
+++ b/test-suite/standalone/Makefile.am
@@ -1,6 +1,7 @@
 ## Process this file with automake to produce Makefile.in.
 ##
-## Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Software Foundation, Inc.
+## Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+##   2011 Free Software Foundation, Inc.
 ##
 ## This file is part of GUILE.
 ##
@@ -78,6 +79,8 @@ test_round_LDADD = ${top_builddir}/libguile/libguile-@GUILE_EFFECTIVE_VERSION@.l
 check_PROGRAMS += test-round
 TESTS += test-round
 
+if HAVE_SHARED_LIBRARIES
+
 # test-asmobs
 noinst_LTLIBRARIES += libtest-asmobs.la
 libtest_asmobs_la_SOURCES = test-asmobs-lib.c
@@ -97,6 +100,8 @@ libtest_ffi_la_LIBADD = ${top_builddir}/libguile/libguile-@GUILE_EFFECTIVE_VERSI
 check_SCRIPTS += test-ffi
 TESTS += test-ffi
 
+endif HAVE_SHARED_LIBRARIES
+
 # test-list
 test_list_SOURCES = test-list.c
 test_list_CFLAGS = ${test_cflags}
@@ -154,6 +159,8 @@ test_scm_take_u8vector_LDADD = ${top_builddir}/libguile/libguile-@GUILE_EFFECTIV
 check_PROGRAMS += test-scm-take-u8vector
 TESTS += test-scm-take-u8vector
 
+if HAVE_SHARED_LIBRARIES
+
 # test-extensions
 noinst_LTLIBRARIES += libtest-extensions.la
 libtest_extensions_la_SOURCES = test-extensions-lib.c
@@ -163,6 +170,8 @@ libtest_extensions_la_LIBADD = ${top_builddir}/libguile/libguile-@GUILE_EFFECTIV
 check_SCRIPTS += test-extensions
 TESTS += test-extensions
 
+endif HAVE_SHARED_LIBRARIES
+
 if BUILD_PTHREAD_SUPPORT
 
 # test-with-guile-module