From 6d42e13a46b970c7197e1b70f6440ada1f8ec410 Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Mon, 1 Nov 2021 14:10:28 -0300 Subject: build: Normalize HAVE_SUID See commit 15d793838 ("Try to fix #2310 -- Can't create run directory without suid-root", 2021-05-13) / PR #4273. It is the only "HAVE_" option whose value is set by if/else on a makefile. Also, it is set in different places to either "yes", "no", blank or "-DHAVE_SUID". Set the value only on configure.ac and only to either blank or to "-DHAVE_SUID". Misc: The `ifeq ($(HAVE_SUID),-DHAVE_SUID)` comparison that this adds is based on the existing `ifeq ($(HAVE_APPARMOR),-DHAVE_APPARMOR)` comparison on Makefile.in. --- configure | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'configure') diff --git a/configure b/configure index f3b99d7d1..3d5c9d161 100755 --- a/configure +++ b/configure @@ -3757,10 +3757,9 @@ if test "${enable_suid+set}" = set; then : enableval=$enable_suid; fi -if test "x$enable_suid" = "xno"; then : - HAVE_SUID="no" -else - HAVE_SUID="yes" +if test "x$enable_suid" != "xno"; then : + + HAVE_SUID="-DHAVE_SUID" fi @@ -3854,7 +3853,7 @@ if test "x$enable_lts" = "xyes"; then : HAVE_USERNS="" HAVE_X11="" HAVE_FILE_TRANSFER="" - HAVE_SUID="yes" + HAVE_SUID="-DHAVE_SUID" BUSYBOX_WORKAROUND="no" HAVE_CONTRIB_INSTALL="no", -- cgit v1.2.3-54-g00ecf