From 5842fe4afe9b5feeeef8cd78a82fa32bcefc1a39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Sat, 14 Oct 2017 11:48:07 +0100 Subject: autotools: dispense if-else shellcheck test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I1fd63442b27460ef21b2aaf4e3639a7d12c72c6e Reviewed-on: https://code.wireshark.org/review/23908 Reviewed-by: João Valverde --- Makefile.am | 8 +------- configure.ac | 3 +-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/Makefile.am b/Makefile.am index 372345e21d..7822edb08e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1114,21 +1114,15 @@ checkapi: checkapi_local cd writecap && $(MAKE) checkapi cd wsutil && $(MAKE) checkapi -if HAVE_SHELLCHECK # --external-sources requires 0.4.0 or later. shellcheck: cd $(top_srcdir) && \ - shellcheck --external-sources \ + $(SHELLCHECK) --external-sources \ tools/fuzz-test.sh \ tools/randpkt-test.sh \ tools/runa2x.sh \ tools/test-captures.sh \ tools/valgrind-wireshark.sh -else -shellcheck: - @echo "Shellcheck not available." ; \ - false -endif wsar_html: doxygen.cfg doxygen_global.cfg FORCE if HAVE_DOXYGEN diff --git a/configure.ac b/configure.ac index a242401d6e..43808ced16 100644 --- a/configure.ac +++ b/configure.ac @@ -495,8 +495,7 @@ AC_CHECK_PROG(have_sw_vers, sw_vers, "yes", "no") AM_CONDITIONAL(NOT_MACOS, test "x$have_sw_vers" = "xno") # Shellcheck -AC_CHECK_PROG(HAVE_SHELLCHECK, shellcheck, "yes", "no") -AM_CONDITIONAL(HAVE_SHELLCHECK, test x$HAVE_SHELLCHECK = xyes) +AC_CHECK_PROGS(SHELLCHECK, shellcheck, shellcheck) # # Check compiler vendor. For GCC this will be 'gnu' and for Clang 'clang'. -- cgit v1.2.3