Merge remote-tracking branch 'upstream/main' into HEAD

.github/workflows/release.yml

@@ -35,12 +35,16 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+      - name: Install ronn
+        run: |
+          sudo apt update
+          sudo apt install -y ronn
       - name: Configure
         run: |
           echo "VERSION=${GITHUB_REF#refs/*/v}" >> $GITHUB_ENV
           echo "${GITHUB_REF#refs/*/v}" > .tarball-version
           ./bootstrap.sh
-          ./configure --disable-dependency-checks
+          ./configure
       - name: Build source package
         run: |
           make dist

configure.ac

@@ -6,7 +6,7 @@ AM_SILENT_RULES([yes])
 AC_CONFIG_MACRO_DIR([build-aux])
 
 AC_DEFUN([AX_PROGVAR], [
-          test -n "$m4_toupper($1)" || AC_PATH_PROG(m4_toupper($1), m4_default($2,$1))
+          test -n "$m4_toupper($1)" || { AC_PATH_PROG(m4_toupper($1), m4_default($2,$1)) }
           test -n "$m4_toupper($1)" || AC_MSG_ERROR([m4_default($2,$1) is required])
           ])
 

vcsh.in

@@ -575,8 +575,7 @@ write_gitignore() {
 	done
 	IFS=$OLDIFS
 	if diff -N "$tempfile" "$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME" > /dev/null; then
-		rm -f "$tempfile" || error "could not delete '$tempfile'"
-		exit
+		rm -f "$tempfile" || fatal "could not delete '$tempfile'" 59
 	fi
 	if [ -e "$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME" ]; then
 		info "'$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME' differs from new data, moving it to '$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME.bak'"