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.

1 files changed, 4 insertions, 5 deletions

diff --git a/configure.ac b/configure.ac
index ace02dcb6..2870148cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -191,10 +191,9 @@ HAVE_SUID=""
 AC_SUBST([HAVE_SUID])
 AC_ARG_ENABLE([suid],
     [AS_HELP_STRING([--disable-suid], [install as a non-SUID executable])])
-AS_IF([test "x$enable_suid" = "xno"],
-        [HAVE_SUID="no"],
-        [HAVE_SUID="yes"]
-)
+AS_IF([test "x$enable_suid" != "xno"], [
+        HAVE_SUID="-DHAVE_SUID"
+])
 
 HAVE_FATAL_WARNINGS=""
 AC_SUBST([HAVE_FATAL_WARNINGS])
@@ -257,7 +256,7 @@ AS_IF([test "x$enable_lts" = "xyes"], [
         HAVE_USERNS=""
         HAVE_X11=""
         HAVE_FILE_TRANSFER=""
-        HAVE_SUID="yes"
+        HAVE_SUID="-DHAVE_SUID"
         BUSYBOX_WORKAROUND="no"
         HAVE_CONTRIB_INSTALL="no",
 ])