Create lib/lib symlinks in microcode/configure.

* src/Setup.sh, src/microcode/configure.ac: Create the src/lib/lib/
symlinks in microcode/configure, which has the list of enabled
modules.

diff --git a/src/Setup.sh b/src/Setup.sh
index 7e52efe46722c0f65f45e530570e59812cd4d8c1..3d1771a4dd2804f45eb4f4a7da60e58f5b074c03 100755 (executable)
--- a/src/Setup.sh
+++ b/src/Setup.sh
@@ -87,16 +87,6 @@ maybe_link lib/runtime ../runtime
 maybe_link lib/mit-scheme.h ../microcode/pruxffi.h
 maybe_link lib/ffi ../ffi
 
-# This is a kludge so that liarc bundles can coexist with microcode
-# modules in the same lib directory.  If you have a better way to make
-# this work, please implement it.  Making lib/lib a symlink to
-# ../microcode does not work -- configure.ac wants to make symlinks at
-# lib/lib/sf.so to ../../sf/sf.so, &c.
-maybe_mkdir lib/lib
-for MODULE in prbfish prmd5 prmhash prmcrypt prgdbm prdb4 prpgsql prx11; do
-  maybe_link "lib/lib/${MODULE}.so" "../../microcode/${MODULE}.so"
-done
-
 for SUBDIR in ${INSTALLED_SUBDIRS} ${OTHER_SUBDIRS}; do
     echo "setting up ${SUBDIR}"
     maybe_link ${SUBDIR}/Setup.sh ../etc/Setup.sh

diff --git a/src/microcode/configure.ac b/src/microcode/configure.ac
index 66c1bdf83164e5a4ce89b5ba27aa8266ea60c821..ec353d8098b4a2f04b23f3728fa881378e6f4c0e 100644 (file)
--- a/src/microcode/configure.ac
+++ b/src/microcode/configure.ac
@@ -1025,6 +1025,12 @@ if test "x${MODULE_BASES}" != x; then
        echo "  " '$(COMPILE_MODULE)' -c '$*.c' >> ${MODULE_RULES}
     done
 fi
+if test "x${MODULE_TARGETS}" != x; then
+    if test ! -e ../lib/lib; then mkdir ../lib/lib; fi
+    for BASE in ${MODULE_TARGETS}; do
+       ln -sf ../../microcode/${BASE} ../lib/lib/${BASE}
+    done
+fi
 
 AC_SUBST([AS_FLAGS])
 AC_SUBST([GC_HEAD_FILES])