Skip to content
Browse files

Remove the obsolete compile-time option SQLITE_THREAD_OVERRIDE_LOCK

from the autoconf makefile.  Needed only for LinuxThreads, which we no
longer support.
  • Loading branch information...
1 parent 1aa6286 commit 683ae9fcb27b428d456da84a111ff8800f5ae21c Unknown committed
Showing with 14 additions and 66 deletions.
  1. +0 −4 Makefile.in
  2. +14 −44 configure
  3. +0 −18 configure.ac
View
4 Makefile.in
@@ -59,10 +59,6 @@ LIBREADLINE = @TARGET_READLINE_LIBS@
#
TCC += -DSQLITE_THREADSAFE=@SQLITE_THREADSAFE@
-# Do threads override each others locks by default (1), or do we test (-1)
-#
-TCC += -DSQLITE_THREAD_OVERRIDE_LOCK=@THREADSOVERRIDELOCKS@
-
# Any target libraries which libsqlite must be linked against
#
TLIBS = @LIBS@
View
58 configure
@@ -869,7 +869,6 @@ VERSION_NUMBER
BUILD_CC
SQLITE_THREADSAFE
XTHREADCONNECT
-THREADSOVERRIDELOCKS
ALLOWRELEASE
TEMP_STORE
BUILD_EXEEXT
@@ -912,7 +911,6 @@ enable_largefile
with_hints
enable_threadsafe
enable_cross_thread_connections
-enable_threads_override_locks
enable_releasemode
enable_tempstore
enable_tcl
@@ -1569,8 +1567,6 @@ Optional Features:
--enable-threadsafe Support threadsafe operation
--enable-cross-thread-connections
Allow connection sharing across threads
- --enable-threads-override-locks
- Threads can override each others locks
--enable-releasemode Support libtool link to release mode
--enable-tempstore Use an in-ram database for temporary tables
(never,no,yes,always)
@@ -3738,13 +3734,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:3741: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:3737: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:3744: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:3740: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:3747: output\"" >&5)
+ (eval echo "\"\$as_me:3743: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -4966,7 +4962,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4969 "configure"' > conftest.$ac_ext
+ echo '#line 4965 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -6835,11 +6831,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6838: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6834: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6842: \$? = $ac_status" >&5
+ echo "$as_me:6838: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7174,11 +7170,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7177: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7173: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7181: \$? = $ac_status" >&5
+ echo "$as_me:7177: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7279,11 +7275,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7282: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7278: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7286: \$? = $ac_status" >&5
+ echo "$as_me:7282: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -7334,11 +7330,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7337: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7333: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7341: \$? = $ac_status" >&5
+ echo "$as_me:7337: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10147,7 +10143,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10150 "configure"
+#line 10146 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10243,7 +10239,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10246 "configure"
+#line 10242 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12581,32 +12577,6 @@ fi
##########
-# 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.
-#
-# Check whether --enable-threads-override-locks was given.
-if test "${enable_threads_override_locks+set}" = set; then
- enableval=$enable_threads_override_locks;
-else
- enable_threads_override_locks=no
-fi
-
-{ $as_echo "$as_me:$LINENO: checking whether threads can override each others locks" >&5
-$as_echo_n "checking whether threads can override each others locks... " >&6; }
-if test "$enable_threads_override_locks" = "no"; then
- THREADSOVERRIDELOCKS='-1'
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-else
- THREADSOVERRIDELOCKS='1'
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-
-
-##########
# Do we want to support release
#
# Check whether --enable-releasemode was given.
View
18 configure.ac
@@ -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,

0 comments on commit 683ae9f

Please sign in to comment.
Something went wrong with that request. Please try again.