diff options
author | Marius Vollmer <mvo@zagadka.de> | 2004-10-22 13:01:59 +0000 |
---|---|---|
committer | Marius Vollmer <mvo@zagadka.de> | 2004-10-22 13:01:59 +0000 |
commit | a8255dca087b3ea05dbd95e0b0ddd85c1d94641d (patch) | |
tree | 581e2e53ca2834b9fdc47f104f521240359b8675 | |
parent | c62a2bb99f84fa019fc5b0c5d8ee84ad029b1d42 (diff) | |
download | guile-a8255dca087b3ea05dbd95e0b0ddd85c1d94641d.tar.gz |
* Makefile.am (INCLUDES): Use @LTDLINC@ instead of
"-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>.
-rw-r--r-- | libguile/Makefile.am | 4 | ||||
-rw-r--r-- | libguile/dynl.c | 18 | ||||
-rw-r--r-- | libguile/guile.c | 6 |
3 files changed, 14 insertions, 14 deletions
diff --git a/libguile/Makefile.am b/libguile/Makefile.am index b17160fc5..056e300e2 100644 --- a/libguile/Makefile.am +++ b/libguile/Makefile.am @@ -26,7 +26,7 @@ DEFS = @DEFS@ ## Check for headers in $(srcdir)/.., so that #include ## <libguile/MUMBLE.h> will find MUMBLE.h in this dir when we're ## 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/' \ --regex='/[ \t]*SCM_[G]?DEFINE1?[ \t]*(\([^,]*\),[^,]*/\1/' @@ -174,7 +174,7 @@ noinst_HEADERS = convert.i.c \ private-gc.h 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 # These are headers visible as <guile/mumble.h> diff --git a/libguile/dynl.c b/libguile/dynl.c index ad2b3a32a..ab0d011fe 100644 --- a/libguile/dynl.c +++ b/libguile/dynl.c @@ -53,7 +53,7 @@ maybe_drag_in_eprintf () #include "libguile/validate.h" #include "libguile/dynwind.h" -#include "guile-ltdl.h" +#include <ltdl.h> /* From the libtool manual: "Note that libltdl is not threadsafe, @@ -68,15 +68,15 @@ maybe_drag_in_eprintf () static void * sysdep_dynl_link (const char *fname, const char *subr) { - scm_lt_dlhandle handle; - handle = scm_lt_dlopenext (fname); + lt_dlhandle handle; + handle = lt_dlopenext (fname); if (NULL == handle) { SCM fn; SCM msg; 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)); } return (void *) handle; @@ -85,9 +85,9 @@ sysdep_dynl_link (const char *fname, const char *subr) static void 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; - fptr = scm_lt_dlsym ((scm_lt_dlhandle) handle, symb); + fptr = lt_dlsym ((lt_dlhandle) handle, symb); if (!fptr) { - scm_misc_error (subr, (char *) scm_lt_dlerror (), SCM_EOL); + scm_misc_error (subr, (char *) lt_dlerror (), SCM_EOL); } return fptr; } @@ -107,7 +107,7 @@ sysdep_dynl_func (const char *symb, void *handle, const char *subr) static void sysdep_dynl_init () { - scm_lt_dlinit (); + lt_dlinit (); } scm_t_bits scm_tc16_dynamic_obj; diff --git a/libguile/guile.c b/libguile/guile.c index 7fe2604bb..f153be4d3 100644 --- a/libguile/guile.c +++ b/libguile/guile.c @@ -34,7 +34,7 @@ #ifdef HAVE_CONFIG_H #include <libguile/scmconfig.h> #endif -#include <guile-ltdl.h> +#include <ltdl.h> #ifdef HAVE_WINSOCK2_H #include <winsock2.h> @@ -68,8 +68,8 @@ main (int argc, char **argv) { #if !defined (__MINGW32__) /* libtool automagically inserts this variable into your executable... */ - extern const scm_lt_dlsymlist lt_preloaded_symbols[]; - scm_lt_dlpreload_default (lt_preloaded_symbols); + extern const lt_dlsymlist lt_preloaded_symbols[]; + lt_dlpreload_default (lt_preloaded_symbols); #endif scm_boot_guile (argc, argv, inner_main, 0); return 0; /* never reached */ |