remove --with-tdbsam since it is always built now

(This used to be commit f277cd54ea6be5cad6ea765d992bc4133765ef92)

diff --git a/source3/configure.in b/source3/configure.in
index 280cddbde6249dbfdac7cae3e90cc466695e619c..0b9d4f5d6d09bcbadede2c5a1876281d1a659445 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -2464,23 +2464,6 @@ AC_ARG_WITH(ldapsam,
   AC_MSG_RESULT(no)
 )
 
-#################################################
-# check for a TDB password database
-AC_MSG_CHECKING(whether to use TDB SAM database)
-AC_ARG_WITH(tdbsam,
-[  --with-tdbsam           Include experimental TDB SAM support (default=no)],
-[ case "$withval" in
-  yes)
-    AC_MSG_RESULT(yes)
-    AC_DEFINE(WITH_TDB_SAM,1,[Whether to include experimental TDB SAM support])
-    ;;
-  *)
-    AC_MSG_RESULT(no)
-    ;;
-  esac ],
-  AC_MSG_RESULT(no)
-)
-
 #################################################
 # check for a NISPLUS password database
 AC_MSG_CHECKING(whether to use NISPLUS SAM database)

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 3ff80d07ab2d09534854296ce47e1dba4c8f0dab..7bcd31f62333f68323ae58e61ff35f904e206a0e 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -895,7 +895,7 @@ struct printjob;
 #define MAP_FILE 0
 #endif
 
-#if (!defined(WITH_NISPLUS) && !defined(WITH_LDAP) && !defined(WITH_TDB_SAM))
+#if (!defined(WITH_NISPLUS) && !defined(WITH_LDAP))
 #define USE_SMBPASS_DB 1
 #endif