diff options
author | 2021-11-23 13:40:36 -0300 | |
---|---|---|
committer | 2021-11-25 11:32:08 -0300 | |
commit | 8344145f253d46eef22d958079d6e22a25dff24d (patch) | |
tree | 5fb05e9f64d33d3c18804451b995f223d57ca173 | |
parent | build: Normalize HAVE_SUID (diff) | |
download | firejail-8344145f253d46eef22d958079d6e22a25dff24d.tar.gz firejail-8344145f253d46eef22d958079d6e22a25dff24d.tar.zst firejail-8344145f253d46eef22d958079d6e22a25dff24d.zip |
build: Normalize HAVE_CONTRIB_INSTALL
Added on commit 8d8686af2 ("Make installation of contrib scripts
configurable", 2017-04-13).
Remove redundant argument to AS_IF and make it look more like the other
nearby AS_IF calls.
-rwxr-xr-x | configure | 5 | ||||
-rw-r--r-- | configure.ac | 7 |
2 files changed, 5 insertions, 7 deletions
@@ -3812,9 +3812,8 @@ if test "${enable_contrib_install+set}" = set; then : | |||
3812 | fi | 3812 | fi |
3813 | 3813 | ||
3814 | if test "x$enable_contrib_install" = "xno"; then : | 3814 | if test "x$enable_contrib_install" = "xno"; then : |
3815 | HAVE_CONTRIB_INSTALL="no" | 3815 | |
3816 | else | 3816 | HAVE_CONTRIB_INSTALL="no" |
3817 | HAVE_CONTRIB_INSTALL="yes" | ||
3818 | 3817 | ||
3819 | fi | 3818 | fi |
3820 | 3819 | ||
diff --git a/configure.ac b/configure.ac index 2870148cf..bf501506d 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -225,10 +225,9 @@ HAVE_CONTRIB_INSTALL="yes" | |||
225 | AC_SUBST([HAVE_CONTRIB_INSTALL]) | 225 | AC_SUBST([HAVE_CONTRIB_INSTALL]) |
226 | AC_ARG_ENABLE([contrib-install], | 226 | AC_ARG_ENABLE([contrib-install], |
227 | [AS_HELP_STRING([--enable-contrib-install], [install contrib scripts])]) | 227 | [AS_HELP_STRING([--enable-contrib-install], [install contrib scripts])]) |
228 | AS_IF([test "x$enable_contrib_install" = "xno"], | 228 | AS_IF([test "x$enable_contrib_install" = "xno"], [ |
229 | [HAVE_CONTRIB_INSTALL="no"], | 229 | HAVE_CONTRIB_INSTALL="no" |
230 | [HAVE_CONTRIB_INSTALL="yes"] | 230 | ]) |
231 | ) | ||
232 | 231 | ||
233 | HAVE_FORCE_NONEWPRIVS="" | 232 | HAVE_FORCE_NONEWPRIVS="" |
234 | AC_SUBST([HAVE_FORCE_NONEWPRIVS]) | 233 | AC_SUBST([HAVE_FORCE_NONEWPRIVS]) |