diff options
author | Kelvin M. Klann <kmk3.code@protonmail.com> | 2021-11-01 14:10:28 -0300 |
---|---|---|
committer | Kelvin M. Klann <kmk3.code@protonmail.com> | 2021-11-25 11:32:08 -0300 |
commit | 6d42e13a46b970c7197e1b70f6440ada1f8ec410 (patch) | |
tree | 799170ae63f7a6323cc674cd7025f3ad28f29402 /configure | |
parent | configure*: Remove redundant AC_SUBST calls near HAVE_LTS (diff) | |
download | firejail-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 'configure')
-rwxr-xr-x | configure | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -3757,10 +3757,9 @@ if test "${enable_suid+set}" = set; then : | |||
3757 | enableval=$enable_suid; | 3757 | enableval=$enable_suid; |
3758 | fi | 3758 | fi |
3759 | 3759 | ||
3760 | if test "x$enable_suid" = "xno"; then : | 3760 | if test "x$enable_suid" != "xno"; then : |
3761 | HAVE_SUID="no" | 3761 | |
3762 | else | 3762 | HAVE_SUID="-DHAVE_SUID" |
3763 | HAVE_SUID="yes" | ||
3764 | 3763 | ||
3765 | fi | 3764 | fi |
3766 | 3765 | ||
@@ -3854,7 +3853,7 @@ if test "x$enable_lts" = "xyes"; then : | |||
3854 | HAVE_USERNS="" | 3853 | HAVE_USERNS="" |
3855 | HAVE_X11="" | 3854 | HAVE_X11="" |
3856 | HAVE_FILE_TRANSFER="" | 3855 | HAVE_FILE_TRANSFER="" |
3857 | HAVE_SUID="yes" | 3856 | HAVE_SUID="-DHAVE_SUID" |
3858 | BUSYBOX_WORKAROUND="no" | 3857 | BUSYBOX_WORKAROUND="no" |
3859 | HAVE_CONTRIB_INSTALL="no", | 3858 | HAVE_CONTRIB_INSTALL="no", |
3860 | 3859 | ||