diff options
| author | Tim Potter <tpot@samba.org> | 2001-07-02 08:58:57 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 2001-07-02 08:58:57 +0000 |
| commit | e3284c5c1257254cca133ada4efb5379f4958b7e (patch) | |
| tree | b28db13312f9397c3f2db050d4ad7e2af4cf8e8d | |
| parent | 61b187410531e4efa15694dffff8a44f4d23e578 (diff) | |
| download | samba-e3284c5c1257254cca133ada4efb5379f4958b7e.tar.gz samba-e3284c5c1257254cca133ada4efb5379f4958b7e.tar.bz2 samba-e3284c5c1257254cca133ada4efb5379f4958b7e.zip | |
Only build the pam_winbind module if --with-pam used.
Replaced extra shell variable with_pam_for_crypto with a check against
$with_pam
(This used to be commit 9db0332954e8b37fa5162b26d78de42a7fa533ae)
| -rw-r--r-- | source3/configure.in | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/source3/configure.in b/source3/configure.in index 92c3ce3638..9f67e13ce4 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -1557,7 +1557,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 @@ -1567,7 +1567,6 @@ AC_ARG_WITH(pam, AC_MSG_RESULT(yes) AC_DEFINE(WITH_PAM) LIBS="$LIBS -lpam" - with_pam_for_crypt=yes ;; *) AC_MSG_RESULT(no) @@ -1613,7 +1612,7 @@ AC_ARG_WITH(pam_smbpass, ############################################### # test for where we get crypt() from, but only # if not using PAM -if test $with_pam_for_crypt = no; then +if test $with_pam != yes; then AC_CHECK_FUNCS(crypt) if test x"$ac_cv_func_crypt" = x"no"; then AC_CHECK_LIB(crypt, crypt, [LIBS="$LIBS -lcrypt"; @@ -2222,6 +2221,12 @@ AC_MSG_CHECKING(whether to compile winbind) case "$host_os" in *linux*|*solaris*) WINBIND_TARGETS="$WINBIND_TARGETS \$(WINBIND_PROGS)" + case "$with_pam" in + yes) + WINBIND_TARGETS="$WINBIND_TARGETS \$(WINBIND_PAM_PROGS)" + ;; + *) + esac ;; *) winbind_no_reason=", unsupported on $host_os" |