diff options
author | Andrew Bartlett <abartlet@samba.org> | 2001-09-26 00:22:54 +0000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2001-09-26 00:22:54 +0000 |
commit | 48fb51809a106e6903ea1e8ce20199e148c94494 (patch) | |
tree | 80c4c7c960f5602d3dcc5a4037ecc8784915bdb4 /source3/configure.in | |
parent | 0f4281b9b4a4056e9e087deb15e60ea482af7a74 (diff) | |
download | samba-48fb51809a106e6903ea1e8ce20199e148c94494.tar.gz samba-48fb51809a106e6903ea1e8ce20199e148c94494.tar.bz2 samba-48fb51809a106e6903ea1e8ce20199e148c94494.zip |
Finish Jeremy's passdb merge :-).
(fix up configure.in for default (smbpasswd) option)
Rerun autoconf.
(This used to be commit 0b9e13530d728ef3c19d6ff05d74b7e594bf9a4c)
Diffstat (limited to 'source3/configure.in')
-rw-r--r-- | source3/configure.in | 35 |
1 files changed, 33 insertions, 2 deletions
diff --git a/source3/configure.in b/source3/configure.in index 52779ecff0..4d9b411cc4 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -1748,15 +1748,27 @@ fi fi + +######################################################################################## +## +## TESTS FOR SAM BACKENDS. KEEP THESE GROUPED TOGETHER +## +######################################################################################## + +## set the with_smbpasswd_sam as the default +with_smbpasswd_sam=yes + + ################################################# # check for a TDB password database -AC_MSG_CHECKING(whether to use TDB password database) +AC_MSG_CHECKING(whether to use TDB SAM database) AC_ARG_WITH(tdbsam, -[ --with-tdbsam Include experimental TDB password database (default=no)], +[ --with-tdbsam Include experimental TDB SAM support (default=no)], [ case "$withval" in yes) AC_MSG_RESULT(yes) AC_DEFINE(WITH_TDB_SAM) + with_smbpasswd_sam=no ;; *) AC_MSG_RESULT(no) @@ -1801,6 +1813,25 @@ AC_ARG_WITH(nisplussam, esac ], AC_MSG_RESULT(no) ) + +################################################ +# This test should come last because the +# smbpasswd SAM is only used if another format +# has not been defined +AC_MSG_CHECKING(whether to use traditional smbpasswd file) +if test $with_smbpasswd_sam = yes; then + AC_MSG_RESULT(yes) + AC_DEFINE(WITH_SMBPASSWD_SAM) +else + AC_MSG_RESULT(no) +fi + +######################################################################################## +## +## END OF TESTS FOR SAM BACKENDS. +## +######################################################################################## + ################################################# # check for a NISPLUS_HOME support AC_MSG_CHECKING(whether to use NISPLUS_HOME) |