build: TDB_ERR_NESTING is used unconditionally

Therefore, do not bother doing an autoconf test looking for it.

Andrew Bartlett

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Wed Nov 30 00:08:18 CET 2011 on sn-devel-104

diff --git a/source3/configure.in b/source3/configure.in
index 6091a4ad1c01415c12d7f8a7656da200af0d8d8d..529b29b044766114d4762f4517ead91dd23e696b 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -2178,16 +2178,6 @@ then
        AC_SUBST(TDBTOOL)
        TDBTORTURE="bin/tdbtorture\$(EXEEXT)"
        AC_SUBST(TDBTORTURE)
-       ac_cv_have_tdb_err_nesting=yes
-else
-       AC_TRY_COMPILE([#include <tdb.h>],
-                      [enum TDB_ERROR err = TDB_ERR_NESTING],
-                      ac_cv_have_tdb_err_nesting=yes,
-                      ac_cv_have_tdb_err_nesting=no)
-fi
-
-if test x"$ac_cv_have_tdb_err_nesting" = xyes; then
-   AC_DEFINE(HAVE_TDB_ERR_NESTING, 1, [Whether we have TDB_ERR_NESTING])
 fi
 
 SMB_LIBRARY(netapi, 0)

diff --git a/source3/wscript b/source3/wscript
index c329cbf00bd284f15b89ccd881eb0845d4cb6219..25140486f91b9dea2ecebc6e4683ac6cfc430776 100644 (file)
--- a/source3/wscript
+++ b/source3/wscript
@@ -1358,11 +1358,6 @@ main() {
         msg="getcwd takes a NULL argument")
 
 
-    conf.CHECK_CODE('''enum TDB_ERROR err = TDB_ERR_NESTING''',
-                   'HAVE_TDB_ERR_NESTING',
-                   headers='tdb.h',
-                   msg='Checking whether we have TDB_ERR_NESTING')
-
     # UnixWare 7.x has its getspnam in -lgen
     conf.CHECK_FUNCS_IN('getspnam', 'gen')
     conf.CHECK_FUNCS_IN('getspnam', 'security')