mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 03:40:34 +02:00
* dynl.c: Don't define stub procedures if DYNAMIC_LINKING is not
defined. They don't do anything useful, especially since the only case where DYNAMIC_LINKING is undefined seems to be when --with-modules=no is given to configure, which is basically requesting that the "dynamic linking module" be omitted. * Makefile.am (libguile_la_SOURCES): move dynl.c from libguile_la_SOURCES to EXTRA_libguile_la_SOURCES. * extensions.c (load_extension): check DYNAMIC_LINKING for scm_dynamic_call. * init.c (scm_init_guile_1): check DYNAMIC_LINKING for scm_init_dynamic_linking. * configure.in: check dynamic linking before modules. Add dynl.c if dynamic linking is available, i.e., unless --with-modules=no was given to configure.
This commit is contained in:
parent
7e7eb95b41
commit
4f6f9ae3d3
7 changed files with 53 additions and 65 deletions
|
@ -75,8 +75,6 @@ maybe_drag_in_eprintf ()
|
|||
#include "libguile/lang.h"
|
||||
#include "libguile/validate.h"
|
||||
|
||||
#ifdef DYNAMIC_LINKING
|
||||
|
||||
#include "libltdl/ltdl.h"
|
||||
|
||||
/* From the libtool manual: "Note that libltdl is not threadsafe,
|
||||
|
@ -133,46 +131,6 @@ sysdep_dynl_init ()
|
|||
lt_dlinit ();
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
/* no dynamic linking available, throw errors. */
|
||||
|
||||
static void
|
||||
sysdep_dynl_init (void)
|
||||
{
|
||||
}
|
||||
|
||||
static void
|
||||
no_dynl_error (const char *subr)
|
||||
{
|
||||
scm_misc_error (subr, "dynamic linking not available", SCM_EOL);
|
||||
}
|
||||
|
||||
static void *
|
||||
sysdep_dynl_link (const char *filename, const char *subr)
|
||||
{
|
||||
no_dynl_error (subr);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
sysdep_dynl_unlink (void *handle,
|
||||
const char *subr)
|
||||
{
|
||||
no_dynl_error (subr);
|
||||
}
|
||||
|
||||
static void *
|
||||
sysdep_dynl_func (const char *symbol,
|
||||
void *handle,
|
||||
const char *subr)
|
||||
{
|
||||
no_dynl_error (subr);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
scm_t_bits scm_tc16_dynamic_obj;
|
||||
|
||||
#define DYNL_FILENAME(x) (SCM_CELL_OBJECT_1 (x))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue