X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/32785fcd767c52ce826f8f0ed4232360e458f118..9cb5aae31e1c126970843ef9b6e54036b185fd51:/bootstrap

diff --git a/bootstrap b/bootstrap
index 43fee2c..639e6c4 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright © 2011-2012, 2021 Nick Bowler
+# Copyright © 2011-2012, 2021-2023 Nick Bowler
 #
 # Simple script to get started from a fresh git checkout.
 #
@@ -28,7 +28,19 @@ die() {
 $GIT submodule update --init || err "Failed to update submodules from git."
 
 if test -x $GNULIB/gnulib-tool; then
-	$GNULIB/gnulib-tool --update -S || die "Failed to update Gnulib."
+  $GNULIB/gnulib-tool --update -S || die "Failed to update Gnulib."
+
+  exec 3>lib/symfiles.tmp 4<lib/symfiles.tmp
+  rm -f lib/symfiles.tmp
+
+  shared_modules='threadlib'
+  set x --extract-recursive-dependencies $shared_modules; shift
+  (set -x; $GNULIB/gnulib-tool "$@" >&3 ) || die "gnulib-tool failed"
+  shared_modules=`LC_ALL=C sort -u <&4`
+
+  set x --extract-filelist $shared_modules; shift
+  ( set -x; $GNULIB/gnulib-tool "$@" >&3 ) || die "gnulib-tool failed"
+  <&4 grep '^lib/.*[.][^vh][^.]*$' | LC_ALL=C sort -u >lib/symfiles
 else
   err "Gnulib sources are not properly installed in $GNULIB/"
   cat >&2 <<'EOF'
@@ -48,12 +60,6 @@ fi
 $PERL common/scripts/fix-gnulib.pl -o lib/gnulib.mk -i lib/gnulib.mk.in \
 	|| die "Failed to fixup Gnulib makefile fragment."
 
-# Rewrite if ! ... construts produced by gnulib conditional dependencies
-# as these fail in heirloom-sh.
-sed 's/if ! *\(.*gnulib_enabled[^;]*\); then/if \1; then :; else/' \
-  m4/gnulib-comp.m4 >m4/gnulib-comp.m4.new || exit
-mv -f m4/gnulib-comp.m4.new m4/gnulib-comp.m4 || exit
-
 # Punt some automake-generated files so that Gentoo's wrapper script doesn't
 # try to detect the automake version in use.
 rm -f Makefile.in aclocal.m4