add $libir to the ltdl path, not $pkglibdir; add extensionsdir

* libguile/Makefile.am (libpath.h): Fix SCM_LIB_DIR to point to the
  libdir, not pkglibdir. Add SCM_EXTENSIONS_DIR, for a dir to put in the
  dynamic-link search path that's not managed by ldconfig or the like;
  and put this dir in the "extensionsdir" key of %guile-build-info.

* libguile/dynl.c (sysdep_dynl_init): Rename the installed-libdir
  environment var to GUILE_SYSTEM_EXTENSIONS_PATH (from
  GUILE_SYSTEM_LTDL_PATH). Also add SCM_EXTENSIONS_DIR to the ltdl
  search path in the default case.
* meta/uninstalled-env.in: Adapt override to match.

* meta/guile-2.0.pc.in: Add extensionsdir, so you can pkg-config
  --variable=extensionsdir guile-2.0.

1 files changed, 7 insertions, 4 deletions

diff --git a/libguile/dynl.c b/libguile/dynl.c
index 6b13e65a9..52c43e542 100644
--- a/libguile/dynl.c
+++ b/libguile/dynl.c
@@ -118,17 +118,20 @@ sysdep_dynl_init ()
 
   lt_dlinit ();
 
-  env = getenv ("GUILE_SYSTEM_LTDL_PATH");
+  env = getenv ("GUILE_SYSTEM_EXTENSIONS_PATH");
   if (env && strcmp (env, "") == 0)
     /* special-case interpret system-ltdl-path=="" as meaning no system path,
        which is the case during the build */
     ; 
   else if (env)
+    /* FIXME: should this be a colon-separated path? Or is the only point to
+       allow the build system to turn off the installed extensions path? */
     lt_dladdsearchdir (env);
-#ifdef SCM_LIB_DIR
   else
-    lt_dladdsearchdir (SCM_LIB_DIR);
-#endif
+    {
+      lt_dladdsearchdir (SCM_LIB_DIR);
+      lt_dladdsearchdir (SCM_EXTENSIONS_DIR);
+    }
 }
 
 scm_t_bits scm_tc16_dynamic_obj;