From a86f4f6d53d05d6e1027619d00882feff1b857a8 Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson2@worcester.edu>
Date: Sat, 23 Sep 2023 17:12:30 -0400
Subject: Improve Guile load path initialization in launcher script.

Use entire load path from the build environment.
---
 configure.ac | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 779d240..464bfdb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,9 +19,9 @@ GUILE_MODULE_REQUIRED([chickadee])
 GUILE_MODULE_REQUIRED([catbird])
 
 # Installation directories for .scm and .go files.
-guilemoduledir="${datarootdir}/guile/site/$GUILE_EFFECTIVE_VERSION"
-guileobjectdir="${libdir}/guile/$GUILE_EFFECTIVE_VERSION/site-ccache"
-AC_SUBST([guilemoduledir])
-AC_SUBST([guileobjectdir])
+guilemodulepath="${datarootdir}/guile/site/$GUILE_EFFECTIVE_VERSION${GUILE_LOAD_PATH:+:}:$GUILE_LOAD_PATH"
+guileobjectpath="${libdir}/guile/$GUILE_EFFECTIVE_VERSION/site-ccache${GUILE_LOAD_COMPILED_PATH:+:}$GUILE_LOAD_COMPILED_PATH"
+AC_SUBST([guilemodulepath])
+AC_SUBST([guileobjectpath])
 
 AC_OUTPUT
-- 
cgit v1.2.3