mirror of
https://github.com/samba-team/samba.git
synced 2024-12-27 03:21:53 +03:00
merge from 2_2
This commit is contained in:
parent
9513eb87c2
commit
5e9a2084bf
@ -1513,6 +1513,7 @@ AC_ARG_WITH(smbmount,
|
||||
|
||||
#################################################
|
||||
# check for a PAM password database
|
||||
with_pam_for_crypt=no
|
||||
AC_MSG_CHECKING(whether to use PAM password database)
|
||||
AC_ARG_WITH(pam,
|
||||
[ --with-pam Include PAM password database support
|
||||
@ -1522,6 +1523,7 @@ AC_ARG_WITH(pam,
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(WITH_PAM)
|
||||
LIBS="$LIBS -lpam"
|
||||
with_pam_for_crypt=yes
|
||||
;;
|
||||
*)
|
||||
AC_MSG_RESULT(no)
|
||||
@ -1530,6 +1532,19 @@ AC_ARG_WITH(pam,
|
||||
AC_MSG_RESULT(no)
|
||||
)
|
||||
|
||||
|
||||
###############################################
|
||||
# test for where we get crypt() from, but only
|
||||
# if not using PAM
|
||||
if test $with_pam_for_crypt = no; then
|
||||
AC_CHECK_FUNCS(crypt)
|
||||
if test x"$ac_cv_func_crypt" = x"no"; then
|
||||
AC_CHECK_LIB(crypt, crypt, [LIBS="$LIBS -lcrypt";
|
||||
AC_DEFINE(HAVE_CRYPT)])
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
#################################################
|
||||
# check for a TDB password database
|
||||
AC_MSG_CHECKING(whether to use TDB password database)
|
||||
|
Loading…
Reference in New Issue
Block a user