summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2001-04-19 13:47:12 +0000
committerAndrew Tridgell <tridge@samba.org>2001-04-19 13:47:12 +0000
commit410ad565945be6e3933312ac4b14aacaf172a648 (patch)
tree063e41f5c24a3ce4ebd6ab4f0d0a7541f47b22f1
parent6e4b0088298c926e4eb09b1c97f750e5c3feb295 (diff)
downloadsamba-410ad565945be6e3933312ac4b14aacaf172a648.tar.gz
samba-410ad565945be6e3933312ac4b14aacaf172a648.tar.bz2
samba-410ad565945be6e3933312ac4b14aacaf172a648.zip
merge from 2_2
(This used to be commit 5e9a2084bfa555295f60485fc83f9bb9245f3fd4)
-rw-r--r--source3/configure.in15
1 files changed, 15 insertions, 0 deletions
diff --git a/source3/configure.in b/source3/configure.in
index 8fbcf69a9f..a67415c6b8 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -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)