diff options
| author | Dmitry V. Levin <ldv@altlinux.org> | 2020-04-26 19:40:57 +0000 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@altlinux.org> | 2020-04-26 19:40:57 +0000 |
| commit | 46eb2b06c6c86c56e1c485b10019d7f3b2d268c5 (patch) | |
| tree | f04ceb411343ef75d497dcb8c408096b39508ed1 /configure.ac | |
| parent | 276bd9a38b879e979e3e5b38639c5298f5dd1c11 (diff) | |
build: move pam_namespace build condition to modules/Makefile.am
* configure.ac (AM_CONDITIONAL): Replace HAVE_UNSHARE with
COND_BUILD_PAM_NAMESPACE.
* modules/Makefile.am [COND_BUILD_PAM_NAMESPACE] (MAYBE_PAM_NAMESPACE):
Define.
(SUBDIRS): Replace pam_namespace with $(MAYBE_PAM_NAMESPACE).
* modules/pam_namespace/Makefile.am: Assume HAVE_UNSHARE.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index f3ef8372..cfcc622a 100644 --- a/configure.ac +++ b/configure.ac @@ -578,7 +578,6 @@ AC_CHECK_FUNCS([logwtmp]) LIBS=$BACKUP_LIBS AC_CHECK_FUNCS(unshare, [UNSHARE=yes], [UNSHARE=no]) -AM_CONDITIONAL([HAVE_UNSHARE], [test "$UNSHARE" = yes]) AC_ARG_ENABLE([regenerate-docu], AS_HELP_STRING([--disable-regenerate-docu],[Don't re-build documentation from XML sources]), @@ -658,6 +657,7 @@ AC_DEFINE_UNQUOTED(PAM_USERTYPE_OVERFLOW_UID, $opt_kerneloverflowuid, [Kernel ov AM_CONDITIONAL([COND_BUILD_PAM_CRACKLIB], [test -n "$LIBCRACK"]) AM_CONDITIONAL([COND_BUILD_PAM_KEYINIT], [test "$have_key_syscalls" = 1]) AM_CONDITIONAL([COND_BUILD_PAM_LASTLOG], [test "$ac_cv_func_logwtmp" = yes]) +AM_CONDITIONAL([COND_BUILD_PAM_NAMESPACE], [test "$UNSHARE" = yes]) AM_CONDITIONAL([COND_BUILD_PAM_RHOSTS], [test "$ac_cv_func_ruserok_af" = yes -o "$ac_cv_func_ruserok" = yes]) AM_CONDITIONAL([COND_BUILD_PAM_SETQUOTA], [test "$ac_cv_func_quotactl" = yes]) AM_CONDITIONAL([COND_BUILD_PAM_TTY_AUDIT], [test "$HAVE_AUDIT_TTY_STATUS" = yes]) |