mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-01 20:30:28 +02:00
Code Activity

* Makefile.am (INCLUDES): Use @LTDLINC@ instead of

Browse source 
"-I$(top_srcdir)/libguile-ltdl".
(libguile_la_LIBADD): Use @LIBLTDL@ instead of
"../libguile-ltdl/libguile-ltdl.a".

* guile.c, dynl.c: Switched to using libltdl directly.  Replaced
all references to scm_lt_* with just lt_*.  Include <ltdl.h>
instead of <libguile-ltdl.h>.
This commit is contained in:
Marius Vollmer 2004-10-22 13:01:59 +00:00
parent c62a2bb99f
commit a8255dca08
3 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libguile/Makefile.am
View file

@ -26,7 +26,7 @@ DEFS = @DEFS@
## Check for headers in $(srcdir)/.., so that #include ## Check for headers in $(srcdir)/.., so that #include
## <libguile/MUMBLE.h> will find MUMBLE.h in this dir when we're ## <libguile/MUMBLE.h> will find MUMBLE.h in this dir when we're
## building. ## building.
INCLUDES = -I.. -I$(top_srcdir) -I$(top_srcdir)/libguile-ltdl INCLUDES = -I.. -I$(top_srcdir) @LTDLINC@
ETAGS_ARGS = --regex='/SCM_\(GLOBAL_\)?\(G?PROC\|G?PROC1\|SYMBOL\|VCELL\|CONST_LONG\).*\"\([^\"]\)*\"/\3/' \ ETAGS_ARGS = --regex='/SCM_\(GLOBAL_\)?\(G?PROC\|G?PROC1\|SYMBOL\|VCELL\|CONST_LONG\).*\"\([^\"]\)*\"/\3/' \
--regex='/[ \t]*SCM_[G]?DEFINE1?[ \t]*(\([^,]*\),[^,]*/\1/' --regex='/[ \t]*SCM_[G]?DEFINE1?[ \t]*(\([^,]*\),[^,]*/\1/'
@ -174,7 +174,7 @@ noinst_HEADERS = convert.i.c \
private-gc.h private-gc.h
libguile_la_DEPENDENCIES = @LIBLOBJS@ libguile_la_DEPENDENCIES = @LIBLOBJS@
libguile_la_LIBADD = @LIBLOBJS@ ../libguile-ltdl/libguile-ltdl.la libguile_la_LIBADD = @LIBLOBJS@ @LIBLTDL@
libguile_la_LDFLAGS = @LTLIBINTL@ -version-info @LIBGUILE_INTERFACE_CURRENT@:@LIBGUILE_INTERFACE_REVISION@:@LIBGUILE_INTERFACE_AGE@ -export-dynamic -no-undefined libguile_la_LDFLAGS = @LTLIBINTL@ -version-info @LIBGUILE_INTERFACE_CURRENT@:@LIBGUILE_INTERFACE_REVISION@:@LIBGUILE_INTERFACE_AGE@ -export-dynamic -no-undefined
# These are headers visible as <guile/mumble.h> # These are headers visible as <guile/mumble.h>

18
libguile/dynl.c
View file

@ -53,7 +53,7 @@ maybe_drag_in_eprintf ()
#include "libguile/validate.h" #include "libguile/validate.h"
#include "libguile/dynwind.h" #include "libguile/dynwind.h"
#include "guile-ltdl.h" #include <ltdl.h>
/* /*
From the libtool manual: "Note that libltdl is not threadsafe, From the libtool manual: "Note that libltdl is not threadsafe,
@ -68,15 +68,15 @@ maybe_drag_in_eprintf ()
static void * static void *
sysdep_dynl_link (const char *fname, const char *subr) sysdep_dynl_link (const char *fname, const char *subr)
{ {
scm_lt_dlhandle handle; lt_dlhandle handle;
handle = scm_lt_dlopenext (fname); handle = lt_dlopenext (fname);
if (NULL == handle) if (NULL == handle)
{ {
SCM fn; SCM fn;
SCM msg; SCM msg;
fn = scm_from_locale_string (fname); fn = scm_from_locale_string (fname);
msg = scm_from_locale_string (scm_lt_dlerror ()); msg = scm_from_locale_string (lt_dlerror ());
scm_misc_error (subr, "file: ~S, message: ~S", scm_list_2 (fn, msg)); scm_misc_error (subr, "file: ~S, message: ~S", scm_list_2 (fn, msg));
} }
return (void *) handle; return (void *) handle;
@ -85,9 +85,9 @@ sysdep_dynl_link (const char *fname, const char *subr)
static void static void
sysdep_dynl_unlink (void *handle, const char *subr) sysdep_dynl_unlink (void *handle, const char *subr)
{ {
if (scm_lt_dlclose ((scm_lt_dlhandle) handle)) if (lt_dlclose ((lt_dlhandle) handle))
{ {
scm_misc_error (subr, (char *) scm_lt_dlerror (), SCM_EOL); scm_misc_error (subr, (char *) lt_dlerror (), SCM_EOL);
} }
} }
@ -96,10 +96,10 @@ sysdep_dynl_func (const char *symb, void *handle, const char *subr)
{ {
void *fptr; void *fptr;
fptr = scm_lt_dlsym ((scm_lt_dlhandle) handle, symb); fptr = lt_dlsym ((lt_dlhandle) handle, symb);
if (!fptr) if (!fptr)
{ {
scm_misc_error (subr, (char *) scm_lt_dlerror (), SCM_EOL); scm_misc_error (subr, (char *) lt_dlerror (), SCM_EOL);
} }
return fptr; return fptr;
} }
@ -107,7 +107,7 @@ sysdep_dynl_func (const char *symb, void *handle, const char *subr)
static void static void
sysdep_dynl_init () sysdep_dynl_init ()
{ {
scm_lt_dlinit (); lt_dlinit ();
} }
scm_t_bits scm_tc16_dynamic_obj; scm_t_bits scm_tc16_dynamic_obj;

6
libguile/guile.c
View file

@ -34,7 +34,7 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <libguile/scmconfig.h> #include <libguile/scmconfig.h>
#endif #endif
#include <guile-ltdl.h> #include <ltdl.h>
#ifdef HAVE_WINSOCK2_H #ifdef HAVE_WINSOCK2_H
#include <winsock2.h> #include <winsock2.h>
@ -68,8 +68,8 @@ main (int argc, char **argv)
{ {
#if !defined (__MINGW32__) #if !defined (__MINGW32__)
/* libtool automagically inserts this variable into your executable... */ /* libtool automagically inserts this variable into your executable... */
extern const scm_lt_dlsymlist lt_preloaded_symbols[]; extern const lt_dlsymlist lt_preloaded_symbols[];
scm_lt_dlpreload_default (lt_preloaded_symbols); lt_dlpreload_default (lt_preloaded_symbols);
#endif #endif
scm_boot_guile (argc, argv, inner_main, 0); scm_boot_guile (argc, argv, inner_main, 0);
return 0; /* never reached */ return 0; /* never reached */