Index: third_party/sqlite/src/configure.ac |
diff --git a/third_party/sqlite/src/configure.ac b/third_party/sqlite/src/configure.ac |
index 441cf7808cedb8b126de5fcddebfacb4962d7ef1..464ed1ef11c6566d881d8ce7e55d88b9137ca8fa 100644 |
--- a/third_party/sqlite/src/configure.ac |
+++ b/third_party/sqlite/src/configure.ac |
@@ -139,7 +139,7 @@ USE_AMALGAMATION=1 |
# if not, then we fall back to plain tclsh. |
# TODO: try other versions before falling back? |
# |
-AC_CHECK_PROGS(TCLSH_CMD, [tclsh8.4 tclsh], none) |
+AC_CHECK_PROGS(TCLSH_CMD, [tclsh8.5 tclsh], none) |
if test "$TCLSH_CMD" = "none"; then |
# If we can't find a local tclsh, then building the amalgamation will fail. |
# We act as though --disable-amalgamation has been used. |
@@ -269,24 +269,6 @@ fi |
AC_SUBST(XTHREADCONNECT) |
########## |
-# Do we want to set threadsOverrideEachOthersLocks variable to be 1 (true) by |
-# default. Normally, a test at runtime is performed to determine the |
-# appropriate value of this variable. Use this option only if you're sure that |
-# threads can safely override each others locks in all runtime situations. |
-# |
-AC_ARG_ENABLE(threads-override-locks, |
-AC_HELP_STRING([--enable-threads-override-locks],[Threads can override each others locks]),,enable_threads_override_locks=no) |
-AC_MSG_CHECKING([whether threads can override each others locks]) |
-if test "$enable_threads_override_locks" = "no"; then |
- THREADSOVERRIDELOCKS='-1' |
- AC_MSG_RESULT([no]) |
-else |
- THREADSOVERRIDELOCKS='1' |
- AC_MSG_RESULT([yes]) |
-fi |
-AC_SUBST(THREADSOVERRIDELOCKS) |
- |
-########## |
# Do we want to support release |
# |
AC_ARG_ENABLE(releasemode, |