summaryrefslogtreecommitdiff
path: root/libguile/extensions.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2011-06-30 12:26:31 +0200
committerAndy Wingo <wingo@pobox.com>2011-06-30 12:26:31 +0200
commit08969a24079bd73582308dc8e8df0ff7c572f0c6 (patch)
tree118d6a86ef8f13da8ac6c832481ac5a5df37c36e /libguile/extensions.c
parent1fa542989ab949b34fcc8f58c8b37e0f20725708 (diff)
downloadguile-08969a24079bd73582308dc8e8df0ff7c572f0c6.tar.gz
fix --disable-modules build
* configure.ac (HAVE_MODULES): Define HAVE_MODULES iff --enable-modules. * libguile/deprecated.c (scm_dynamic_args_call) * libguile/extensions.c (load_extension): * libguile/init.c (scm_i_init_guile): Use HAVE_MODULES in a few places.
Diffstat (limited to 'libguile/extensions.c')
-rw-r--r--libguile/extensions.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/libguile/extensions.c b/libguile/extensions.c
index d830acb59..1c3d28f4a 100644
--- a/libguile/extensions.c
+++ b/libguile/extensions.c
@@ -1,6 +1,6 @@
/* extensions.c - registering and loading extensions.
*
- * Copyright (C) 2001, 2006, 2009, 2010 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2006, 2009, 2010, 2011 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -111,7 +111,13 @@ load_extension (SCM lib, SCM init)
}
/* Dynamically link the library. */
+#if HAVE_MODULES
scm_dynamic_call (init, scm_dynamic_link (lib));
+#else
+ scm_misc_error ("load-extension",
+ "extension ~S:~S not registered and dynamic-link disabled",
+ scm_list_2 (init, lib));
+#endif
}
void