Extend "make shellcheck" onto autogen.sh

Same as in tcpslice and libpcap.

(cherry picked from commit 7e6c85b22a3b9ef11be8737cfb483215b181816c)

diff --git a/Makefile.in b/Makefile.in
index aebfc28dda9569f77e68dedfedb1c58a85dc863e..01729f5bea63fad1c9c8766f652f917250fc37ec 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -578,4 +578,4 @@ depend:
        @$(MKDEP) -c "$(CC)" -m "$(DEPENDENCY_CFLAG)" -s "$(srcdir)" $(DEFS) $(INCLS) $(SRC) $(LIBNETDISSECT_SRC)
 
 shellcheck:
-       shellcheck -f gcc -e SC2006 build.sh build_matrix.sh build_common.sh .ci-coverity-scan-build.sh
+       shellcheck -f gcc -e SC2006 autogen.sh build.sh build_matrix.sh build_common.sh .ci-coverity-scan-build.sh

diff --git a/autogen.sh b/autogen.sh
index b3c321b034dae1df8baa28d6244b14bf263e3076..c84a6b5c5dd256080187e14cd2a1d48dc49296b9 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -8,7 +8,7 @@ maj=`echo "$AUTORECONFVERSION" | cut -d. -f1`
 min=`echo "$AUTORECONFVERSION" | cut -d. -f2`
 # The minimum required version of autoconf is currently 2.69.
 if [ "$maj" = "" ] || [ "$min" = "" ] || \
-   [ "$maj" -lt 2 ] || [ "$maj" -eq 2 -a "$min" -lt 69 ]; then
+   [ "$maj" -lt 2 ] || { [ "$maj" -eq 2 ] && [ "$min" -lt 69 ]; }; then
        cat >&2 <<-EOF
        Please install the 'autoconf' package version 2.69 or later.
        If version 2.69 or later is already installed and there is no