diff options
| author | Andy Wingo <wingo@pobox.com> | 2009-09-16 18:10:19 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2009-09-16 18:10:19 +0200 |
| commit | eb350124a85dd4daf39bacbdc50452ef87a33a43 (patch) | |
| tree | 96674005d8eb32842ca07305b5cfe0ae2480e602 /meta/uninstalled-env.in | |
| parent | db723980a4b1e4d4d4d665283d1bc0b792c751bf (diff) | |
add the libdir to the ltdl lib search path
* libguile/Makefile.am (libpath.h): Fix pkgdatadir, pkglibdir, and
pkgincludedir entries. Add a new define, SCM_LIB_DIR.
* libguile/dynl.c (sysdep_dynl_init): Add the libdir to the libltdl
search path. Should fix
http://thread.gmane.org/gmane.lisp.guile.bugs/4289/focus=4296 -- that
is, it should allow guile to be invoked from whereever it is
installed, without munging LTDL_LIBRARY_PATH or the like variables.
There is a trick though -- during the build, we don't want to be
looking in the $libdir for loadable modules. So as with
GUILE_SYSTEM_PATH, we have GUILE_SYSTEM_LTDL_PATH.
* meta/uninstalled-env.in: Set GUILE_SYSTEM_LTDL_PATH to "" when
building.
Diffstat (limited to 'meta/uninstalled-env.in')
| -rw-r--r-- | meta/uninstalled-env.in | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/uninstalled-env.in b/meta/uninstalled-env.in index 9a6227230..649d1fc47 100644 --- a/meta/uninstalled-env.in +++ b/meta/uninstalled-env.in @@ -88,6 +88,10 @@ export GUILE_LOAD_COMPILED_PATH if ( env | grep -v -q -E '^GUILE_SYSTEM_COMPILED_PATH=' ); then export GUILE_SYSTEM_COMPILED_PATH= fi +# Don't look in installed dirs for dlopen-able modules +if ( env | grep -v -q -E '^GUILE_SYSTEM_LTDL_PATH=' ); then + export GUILE_SYSTEM_LTDL_PATH= +fi # handle LTDL_LIBRARY_PATH (no clobber) ltdl_prefix="" |