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 | 33360292d4dfa8d53eb1e359cd5a2f516c9cc021 (patch) | |
| tree | 6d3df2a7e622b2addf2a4741080a8bb5679cd9ca | |
| parent | 46eb2b06c6c86c56e1c485b10019d7f3b2d268c5 (diff) | |
| download | pam-33360292d4dfa8d53eb1e359cd5a2f516c9cc021.tar.gz pam-33360292d4dfa8d53eb1e359cd5a2f516c9cc021.tar.bz2 pam-33360292d4dfa8d53eb1e359cd5a2f516c9cc021.zip | |
build: simplify the check for unshare function
* configure.ac (AC_CHECK_FUNCS): Do not set UNSHARE when checking for
unshare function.
(COND_BUILD_PAM_NAMESPACE): Check for $ac_cv_func_unshare instead of
$UNSHARE.
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index cfcc622a..535b0ae5 100644 --- a/configure.ac +++ b/configure.ac @@ -571,14 +571,13 @@ AC_CHECK_FUNCS(getutent_r getpwnam_r getpwuid_r getgrnam_r getgrgid_r getspnam_r AC_CHECK_FUNCS(getgrouplist getline getdelim) AC_CHECK_FUNCS(inet_ntop inet_pton innetgr) AC_CHECK_FUNCS(quotactl) +AC_CHECK_FUNCS(unshare) AC_CHECK_FUNCS([ruserok_af ruserok], [break]) BACKUP_LIBS=$LIBS LIBS="$LIBS -lutil" AC_CHECK_FUNCS([logwtmp]) LIBS=$BACKUP_LIBS -AC_CHECK_FUNCS(unshare, [UNSHARE=yes], [UNSHARE=no]) - AC_ARG_ENABLE([regenerate-docu], AS_HELP_STRING([--disable-regenerate-docu],[Don't re-build documentation from XML sources]), [enable_docu=$enableval], [enable_docu=yes]) @@ -657,7 +656,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_NAMESPACE], [test "$ac_cv_func_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]) |