- Fix to set makedist.sh to not wget config.sub and

  config.guess from git repo. The fetch times out, and the
  version from libtoolize is much more recent now than
  that it was when the wget was added.

diff --git a/doc/Changelog b/doc/Changelog
index d087c7eef6ba89fe9528059498383fded6c11c62..f299122562a67dc4defc968410104858cd9af3f6 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,9 @@
+4 August 2026: Wouter
+       - Fix to set makedist.sh to not wget config.sub and
+         config.guess from git repo. The fetch times out, and the
+         version from libtoolize is much more recent now than
+         that it was when the wget was added.
+
 31 July 2026: Wouter
        - For #1483: The failure reason when an NSEC NXDOMAIN is
          encountered when looking for an insecure delegation, is

diff --git a/makedist.sh b/makedist.sh
index ec9021c2ccc425c3ab8124345b609a341d1a2abb..07b097738bb7fb295e70864ac4de60ee6aa5f129 100755 (executable)
--- a/makedist.sh
+++ b/makedist.sh
@@ -608,6 +608,8 @@ rm -rf .git .travis.yml .gitattributes .github .gitignore || error_cleanup "Fail
 info "Adding libtool utils (libtoolize)."
 libtoolize -c --install || libtoolize -c || error_cleanup "Libtoolize failed."
 
+# Turn this off, if the git repo times out for lookups.
+if test "updateconfigsub" = "false"; then
 # https://www.gnu.org/software/gettext/manual/html_node/config_002eguess.html
 info "Updating config.guess and config.sub"
 wget -O config.guess 'https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD'
@@ -621,6 +623,7 @@ if [ `uname -s | grep -i -c darwin` -ne 0 ]; then
         xattr -d com.apple.quarantine config.sub
     fi
 fi
+fi
 
 info "Building configure script (autoreconf)."
 autoreconf -f || error_cleanup "Autoconf failed."