aboutsummaryrefslogtreecommitdiffstats
path: root/src/common.mk.in
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2021-11-01 14:10:28 -0300
committerLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2021-11-25 11:32:08 -0300
commit6d42e13a46b970c7197e1b70f6440ada1f8ec410 (patch)
tree799170ae63f7a6323cc674cd7025f3ad28f29402 /src/common.mk.in
parentconfigure*: Remove redundant AC_SUBST calls near HAVE_LTS (diff)
downloadfirejail-6d42e13a46b970c7197e1b70f6440ada1f8ec410.tar.gz
firejail-6d42e13a46b970c7197e1b70f6440ada1f8ec410.tar.zst
firejail-6d42e13a46b970c7197e1b70f6440ada1f8ec410.zip
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.
Diffstat (limited to 'src/common.mk.in')
-rw-r--r--src/common.mk.in6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/common.mk.in b/src/common.mk.in
index c8329e7c2..c55c26f42 100644
--- a/src/common.mk.in
+++ b/src/common.mk.in
@@ -22,11 +22,7 @@ HAVE_FIRETUNNEL=@HAVE_FIRETUNNEL@
22HAVE_PRIVATE_HOME=@HAVE_PRIVATE_HOME@ 22HAVE_PRIVATE_HOME=@HAVE_PRIVATE_HOME@
23HAVE_GCOV=@HAVE_GCOV@ 23HAVE_GCOV=@HAVE_GCOV@
24HAVE_SELINUX=@HAVE_SELINUX@ 24HAVE_SELINUX=@HAVE_SELINUX@
25ifeq (@HAVE_SUID@, yes) 25HAVE_SUID=@HAVE_SUID@
26HAVE_SUID=-DHAVE_SUID
27else
28HAVE_SUID=
29endif
30HAVE_DBUSPROXY=@HAVE_DBUSPROXY@ 26HAVE_DBUSPROXY=@HAVE_DBUSPROXY@
31HAVE_USERTMPFS=@HAVE_USERTMPFS@ 27HAVE_USERTMPFS=@HAVE_USERTMPFS@
32HAVE_OUTPUT=@HAVE_OUTPUT@ 28HAVE_OUTPUT=@HAVE_OUTPUT@