Merge pull request #2621 from keszybz/wheel-group

build-sys: allow wheel group name to be specified

diff --combined configure.ac
index 614f0553b80a528f90d3ad4ba5eb695144d7ec3a,b42f64dde07e0f12aa1bf0bc7e424662fe60f214..f51533c2b3dea72a579aee00a61a62740f990b64
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -295,8 -295,10 +295,8 @@@ CAP_LIBS="$LIBS
  LIBS="$save_LIBS"
  AC_SUBST(CAP_LIBS)
  
 -AC_CHECK_FUNCS([memfd_create])
  AC_CHECK_FUNCS([__secure_getenv secure_getenv])
 -AC_CHECK_DECLS([gettid, pivot_root, name_to_handle_at, setns, getrandom, renameat2,
 -                kcmp, keyctl, key_serial_t, char16_t, char32_t, LO_FLAGS_PARTSCAN],
 +AC_CHECK_DECLS([memfd_create, gettid, pivot_root, name_to_handle_at, setns, getrandom, renameat2, kcmp, keyctl, LO_FLAGS_PARTSCAN],
                 [], [], [[
  #include <sys/types.h>
  #include <unistd.h>
@@@ -307,11 -309,6 +307,11 @@@
  #include <linux/random.h>
  ]])
  
 +AC_CHECK_TYPES([char16_t, char32_t, key_serial_t],
 +               [], [], [[
 +#include <uchar.h>
 +]])
 +
  AC_CHECK_DECLS([IFLA_INET6_ADDR_GEN_MODE,
                  IFLA_MACVLAN_FLAGS,
                  IFLA_IPVLAN_MODE,
@@@ -495,6 -492,14 +495,14 @@@ if test "x$enable_apparmor" != "xno"; t
  fi
  AM_CONDITIONAL(HAVE_APPARMOR, [test "$have_apparmor" = "yes"])
  
+ have_wheel_group=no
+ AC_ARG_ENABLE(wheel-group, AS_HELP_STRING([--disable-wheel-group], [disable wheel group]))
+ AS_IF([test "x$enable_wheel_group" != "xno"], [
+         AC_DEFINE(ENABLE_WHEEL_GROUP, 1, [Define if the ACL for wheel group should be enabled])
+         have_wheel_group=yes
+         M4_DEFINES="$M4_DEFINES -DENABLE_WHEEL_GROUP"
+ ])
+ 
  
  AC_ARG_WITH(debug-shell,
          AS_HELP_STRING([--with-debug-shell=PATH],
@@@ -1131,20 -1136,6 +1139,20 @@@ AC_ARG_WITH(dns-servers
  AC_DEFINE_UNQUOTED(DNS_SERVERS, ["$DNS_SERVERS"], [Default DNS Servers])
  AC_SUBST(DNS_SERVERS)
  
 +AC_ARG_WITH(default-dnssec,
 +        AS_HELP_STRING([--with-default-dnssec=MODE],
 +               [Default DNSSEC mode, defaults to "allow-downgrade"]),
 +        [DEFAULT_DNSSEC_MODE="$withval"],
 +        [DEFAULT_DNSSEC_MODE="allow-downgrade"])
 +
 +AS_CASE("x${DEFAULT_DNSSEC_MODE}",
 +        [xno], [mode=DNSSEC_NO],
 +        [xyes], [mode=DNSSEC_YES],
 +        [xallow-downgrade], [mode=DNSSEC_ALLOW_DOWNGRADE],
 +        AC_MSG_ERROR(Bad DNSSEC mode ${DEFAULT_DNSSEC_MODE}))
 +AC_DEFINE_UNQUOTED(DEFAULT_DNSSEC_MODE, [$mode], [Default DNSSEC mode])
 +AC_SUBST(DEFAULT_DNSSEC_MODE)
 +
  # ------------------------------------------------------------------------------
  have_networkd=no
  AC_ARG_ENABLE(networkd, AS_HELP_STRING([--disable-networkd], [disable networkd]))
@@@ -1576,13 -1567,12 +1584,13 @@@ AC_MSG_RESULT(
          hostnamed:               ${have_hostnamed}
          timedated:               ${have_timedated}
          timesyncd:               ${have_timesyncd}
 -        default NTP servers:     ${NTP_SERVERS}
 +        Default NTP servers:     ${NTP_SERVERS}
          time epoch:              ${TIME_EPOCH}
          localed:                 ${have_localed}
          networkd:                ${have_networkd}
          resolved:                ${have_resolved}
 -        default DNS servers:     ${DNS_SERVERS}
 +        Default DNS servers:     ${DNS_SERVERS}
 +        Default DNSSEC mode:     ${DEFAULT_DNSSEC_MODE}
          coredump:                ${have_coredump}
          polkit:                  ${have_polkit}
          efi:                     ${have_efi}
@@@ -1631,6 -1621,7 +1639,7 @@@
          Zsh completions dir:     ${with_zshcompletiondir}
          Extra start script:      ${RC_LOCAL_SCRIPT_PATH_START}
          Extra stop script:       ${RC_LOCAL_SCRIPT_PATH_STOP}
+         Wheel group:             ${have_wheel_group}
          Debug shell:             ${SUSHELL} @ ${DEBUGTTY}
          TTY GID:                 ${TTY_GID}
          Maximum System UID:      ${SYSTEM_UID_MAX}