From c693ea183aaf2ef9009e89046a6a213762441fdc Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Tue, 27 Sep 2022 05:48:52 -0300 Subject: configure*: fix trailing comma in HAVE_CONTRIB_INSTALL Consider the current code: AS_IF([test "x$enable_lts" = "xyes"], [ # ... HAVE_CONTRIB_INSTALL="no", Result of testing the value: $ HAVE_CONTRIB_INSTALL="no", $ printf '%s\n' "$HAVE_CONTRIB_INSTALL" no, $ test "x$HAVE_CONTRIB_INSTALL" = "xno" && echo equal || echo 'not equal' not equal This means that whenever HAVE_LTS is enabled, HAVE_CONTRIB_INSTALL is always considered enabled when testing against "no". But luckily, in the current code the latter variable is only tested against "yes", so nothing should be affected: $ git grep HAVE_CONTRIB_INSTALL | grep -v -e '^configure:' -e '^configure.ac:' Makefile:ifeq ($(HAVE_CONTRIB_INSTALL),yes) config.mk.in:HAVE_CONTRIB_INSTALL=@HAVE_CONTRIB_INSTALL@ Added on commit d1acb31c9 ("compile time: enable LTS", 2021-02-28). --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 6b9828960..03ee84d46 100755 --- a/configure +++ b/configure @@ -3670,7 +3670,7 @@ if test "x$enable_lts" = "xyes"; then : HAVE_FILE_TRANSFER="" HAVE_SUID="-DHAVE_SUID" BUSYBOX_WORKAROUND="no" - HAVE_CONTRIB_INSTALL="no", + HAVE_CONTRIB_INSTALL="no" fi diff --git a/configure.ac b/configure.ac index 62702f7bc..250dcba88 100644 --- a/configure.ac +++ b/configure.ac @@ -272,7 +272,7 @@ AS_IF([test "x$enable_lts" = "xyes"], [ HAVE_FILE_TRANSFER="" HAVE_SUID="-DHAVE_SUID" BUSYBOX_WORKAROUND="no" - HAVE_CONTRIB_INSTALL="no", + HAVE_CONTRIB_INSTALL="no" ]) AC_CHECK_HEADER([linux/seccomp.h], [], AC_MSG_ERROR([*** SECCOMP support is not installed (/usr/include/linux/seccomp.h missing) ***])) -- cgit v1.2.3-70-g09d2