summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2008-12-07 22:01:50 +0100
committerLudovic Courtès <ludo@gnu.org>2008-12-07 22:35:23 +0100
commitde7d32d064f2178c41dc98540ec5822a286107ae (patch)
tree11d3add18dbf1032b54c2b64aae315488e749d0a
parent14f02d0bcf6ae00c0d35bcf6d390466f24155077 (diff)
downloadguile-de7d32d064f2178c41dc98540ec5822a286107ae.tar.gz
Remove useless references to Libtool's `dlpreopen' mechanism.
* libguile/Makefile.am (guile_LDFLAGS): Remove `@DLPREOPEN@' since it has no effect. * libguile/guile.c (main): Don't invoke `LTDL_SET_PRELOADED_SYMBOLS ()' since it had no effect given how we invoke `libtool'. It also fixes compatibility issues when using libltdl 1.5 with a Libtool 2.2 package.
-rw-r--r--libguile/Makefile.am2
-rw-r--r--libguile/guile.c3
2 files changed, 1 insertions, 4 deletions
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index b5d39776d..d69f02a36 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -101,7 +101,7 @@ guile_filter_doc_snarfage$(EXEEXT): $(guile_filter_doc_snarfage_OBJECTS) $(guile
guile_SOURCES = guile.c
guile_CFLAGS = $(GUILE_CFLAGS) $(AM_CFLAGS)
guile_LDADD = libguile.la
-guile_LDFLAGS = @DLPREOPEN@ $(GUILE_CFLAGS)
+guile_LDFLAGS = $(GUILE_CFLAGS)
libguile_la_CFLAGS = $(GUILE_CFLAGS) $(AM_CFLAGS)
diff --git a/libguile/guile.c b/libguile/guile.c
index ad95d4bc6..c8341c24f 100644
--- a/libguile/guile.c
+++ b/libguile/guile.c
@@ -66,9 +66,6 @@ inner_main (void *closure SCM_UNUSED, int argc, char **argv)
int
main (int argc, char **argv)
{
-#if !defined (__MINGW32__)
- LTDL_SET_PRELOADED_SYMBOLS ();
-#endif
scm_boot_guile (argc, argv, inner_main, 0);
return 0; /* never reached */
}