Remove the obsolete compile-time option SQLITE_THREAD_OVERRIDE_LOCK

from the autoconf makefile.  Needed only for LinuxThreads, which we no
longer support.

FossilOrigin-Name: 09f6c053ff9239c22ecf527ae579446c6e21e550

diff --git a/Makefile.in b/Makefile.in
index d5e29a1bc593fc054c9c7b368367d6451f75cc38..0e2837cd9fe306f6dad6dd5f8b35aa5e746e6d2d 100644 (file)
--- a/Makefile.in
+++ b/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@

diff --git a/configure b/configure
index a3de9e603d04912e7b3ae6a42ed9de3aed93a40d..3d617d0dd860416cf820927d69b06795013fbbc4 100755 (executable)
--- a/configure
+++ b/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
@@ -12580,32 +12576,6 @@ $as_echo "yes" >&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
 #

diff --git a/configure.ac b/configure.ac
index ea8c23f5116504c0b736d23b3fe15a887acd9f9d..464ed1ef11c6566d881d8ce7e55d88b9137ca8fa 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -268,24 +268,6 @@ else
 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
 #

diff --git a/manifest b/manifest
index 17705b4a17b70b2040c5136a1911dd9d1e0abc23..3df97295bb71d7f018da57f36cd6ae76b25939fa 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,7 +1,10 @@
-C Rearrange\sa\svariable\sdeclaration\sin\sthe\sproxy\slocking\scode\sto\savoid\sa\sharmless\ncompiler\swarning\son\srecent\sMacOS\sversions.
-D 2010-12-21T00:16:40
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+C Remove\sthe\sobsolete\scompile-time\soption\sSQLITE_THREAD_OVERRIDE_LOCK\nfrom\sthe\sautoconf\smakefile.\s\sNeeded\sonly\sfor\sLinuxThreads,\swhich\swe\sno\nlonger\ssupport.
+D 2010-12-21T00:20:54
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
-F Makefile.in 4547616ad2286053af6ccccefa242dc925e49bf0
+F Makefile.in de6498556d536ae60bb8bb10e8c1ba011448658c
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 F Makefile.vxworks c85ec1d8597fe2f7bc225af12ac1666e21379151
 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
@@ -22,8 +25,8 @@ F art/src_logo.gif 9341ef09f0e53cd44c0c9b6fc3c16f7f3d6c2ad9
 F config.guess 226d9a188c6196f3033ffc651cbc9dcee1a42977
 F config.h.in 868fdb48c028421a203470e15c69ada15b9ba673
 F config.sub 9ebe4c3b3dab6431ece34f16828b594fb420da55
-F configure daed6cfdb4c1449a4335b3eeddc0d836e33fb54e x
-F configure.ac 699040cc9abb7465dca5a2972bc89d227fd8f734
+F configure 4d325bb1fd4064fc4b8a2102e47e3c8966bbe2cf x
+F configure.ac 87a3c71bbe9c925381c154413eea7f3cdc397244
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
 F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538
 F doc/pager-invariants.txt 870107036470d7c419e93768676fae2f8749cf9e
@@ -894,7 +897,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 3b41bcc3e36a9ef0146bc2f6ae86377bd1700afd
-R 1a70a1f19194c16e9b9725927017bb71
+P 39bbd35599e735b32f7ed18143073165b805dd98
+R 80b3317d427aed8936aa381a5ad6ed6c
 U drh
-Z 9866ee9011213cea3ec50de8e4d375c6
+Z 50f3f1b11bd7b6b561a6a28e34c75c73
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFND/LpoxKgR168RlERAjN/AJ9GW7kKHV8mhDRU/MIZoIFYemwlJQCfS21P
+RmgCdBRtWA88sFD1ddbbF+c=
+=PAHS
+-----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 4ebd5e84babffae0fd5c4775c200645d02969843..beb1ad79d5661034fceb847ea26111430737821c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-39bbd35599e735b32f7ed18143073165b805dd98
\ No newline at end of file
+09f6c053ff9239c22ecf527ae579446c6e21e550
\ No newline at end of file