From: Amos Jeffries Date: Thu, 20 Nov 2025 00:41:32 +0000 (+0000) Subject: Maintenance: Remove ed build dependency (#2304) X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=235f36e98df5d6a99b193c5d83f0292e88dc69d0;p=thirdparty%2Fsquid.git Maintenance: Remove ed build dependency (#2304) The bug this tool was used to fix was resolved upstream in autoconf 2.61 which Squid has required as minimum autoconf version since Squid 3.2. `mkrelease.sh` still depends on `ed`. --- diff --git a/bootstrap.sh b/bootstrap.sh index d7a2b25e26..2f7dbb8bda 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -163,21 +163,4 @@ if test -f SPONSORS.list; then sed -e 's/@Squid-[0-9\.]*://' SPONSORS || (rm -f SPONSORS && exit 1) fi -# Fixup autoconf recursion using --silent/--quiet option -# autoconf should inherit this option when recursing into subdirectories -# but it currently doesn't for some reason. -if ! grep "configure_args --quiet" configure >/dev/null; then -echo "Fixing configure recursion" -ed -s configure <<'EOS' >/dev/null || true -/ac_sub_configure_args=/ -+1 -i - # Add --quiet option if used - test "$silent" = yes && - ac_sub_configure_args="$ac_sub_configure_args --quiet" -. -w -EOS -fi - echo "Autotool bootstrapping complete."