/ Check-in [09f6c053]
Login
SQLite training in Houston TX on 2019-11-05 (details)
Part of the 2019 Tcl Conference

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Remove the obsolete compile-time option SQLITE_THREAD_OVERRIDE_LOCK from the autoconf makefile. Needed only for LinuxThreads, which we no longer support.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 09f6c053ff9239c22ecf527ae579446c6e21e550
User & Date: drh 2010-12-21 00:20:54
Context
2010-12-21
20:36
Merge into the trunk the experimental enhancements to sqlite3_db_status() for measuring lookaside memory allocator performance. check-in: 8c3b06c2 user: drh tags: trunk
00:20
Remove the obsolete compile-time option SQLITE_THREAD_OVERRIDE_LOCK from the autoconf makefile. Needed only for LinuxThreads, which we no longer support. check-in: 09f6c053 user: drh tags: trunk
00:16
Rearrange a variable declaration in the proxy locking code to avoid a harmless compiler warning on recent MacOS versions. check-in: 39bbd355 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to Makefile.in.

    55     55   #
    56     56   LIBREADLINE = @TARGET_READLINE_LIBS@
    57     57   
    58     58   # Should the database engine be compiled threadsafe
    59     59   #
    60     60   TCC += -DSQLITE_THREADSAFE=@SQLITE_THREADSAFE@
    61     61   
    62         -# Do threads override each others locks by default (1), or do we test (-1)
    63         -#
    64         -TCC += -DSQLITE_THREAD_OVERRIDE_LOCK=@THREADSOVERRIDELOCKS@
    65         -
    66     62   # Any target libraries which libsqlite must be linked against
    67     63   # 
    68     64   TLIBS = @LIBS@
    69     65   
    70     66   # Flags controlling use of the in memory btree implementation
    71     67   #
    72     68   # SQLITE_TEMP_STORE is 0 to force temporary tables to be in a file, 1 to

Changes to configure.

   865    865   program_prefix
   866    866   VERSION
   867    867   RELEASE
   868    868   VERSION_NUMBER
   869    869   BUILD_CC
   870    870   SQLITE_THREADSAFE
   871    871   XTHREADCONNECT
   872         -THREADSOVERRIDELOCKS
   873    872   ALLOWRELEASE
   874    873   TEMP_STORE
   875    874   BUILD_EXEEXT
   876    875   SQLITE_OS_UNIX
   877    876   SQLITE_OS_WIN
   878    877   SQLITE_OS_OS2
   879    878   TARGET_EXEEXT
................................................................................
   908    907   enable_fast_install
   909    908   with_gnu_ld
   910    909   enable_libtool_lock
   911    910   enable_largefile
   912    911   with_hints
   913    912   enable_threadsafe
   914    913   enable_cross_thread_connections
   915         -enable_threads_override_locks
   916    914   enable_releasemode
   917    915   enable_tempstore
   918    916   enable_tcl
   919    917   with_tcl
   920    918   enable_readline
   921    919   with_readline_lib
   922    920   with_readline_inc
................................................................................
  1565   1563     --enable-fast-install[=PKGS]
  1566   1564                             optimize for fast installation [default=yes]
  1567   1565     --disable-libtool-lock  avoid locking (might break parallel builds)
  1568   1566     --disable-largefile     omit support for large files
  1569   1567     --enable-threadsafe     Support threadsafe operation
  1570   1568     --enable-cross-thread-connections
  1571   1569                             Allow connection sharing across threads
  1572         -  --enable-threads-override-locks
  1573         -                          Threads can override each others locks
  1574   1570     --enable-releasemode    Support libtool link to release mode
  1575   1571     --enable-tempstore      Use an in-ram database for temporary tables
  1576   1572                             (never,no,yes,always)
  1577   1573     --disable-tcl           do not build TCL extension
  1578   1574     --disable-readline      disable readline support [default=detect]
  1579   1575     --enable-debug          enable debugging & verbose explain
  1580   1576     --disable-amalgamation  Disable the amalgamation and instead build all files
................................................................................
  3734   3730   { $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
  3735   3731   $as_echo_n "checking the name lister ($NM) interface... " >&6; }
  3736   3732   if test "${lt_cv_nm_interface+set}" = set; then
  3737   3733     $as_echo_n "(cached) " >&6
  3738   3734   else
  3739   3735     lt_cv_nm_interface="BSD nm"
  3740   3736     echo "int some_variable = 0;" > conftest.$ac_ext
  3741         -  (eval echo "\"\$as_me:3741: $ac_compile\"" >&5)
         3737  +  (eval echo "\"\$as_me:3737: $ac_compile\"" >&5)
  3742   3738     (eval "$ac_compile" 2>conftest.err)
  3743   3739     cat conftest.err >&5
  3744         -  (eval echo "\"\$as_me:3744: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
         3740  +  (eval echo "\"\$as_me:3740: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
  3745   3741     (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
  3746   3742     cat conftest.err >&5
  3747         -  (eval echo "\"\$as_me:3747: output\"" >&5)
         3743  +  (eval echo "\"\$as_me:3743: output\"" >&5)
  3748   3744     cat conftest.out >&5
  3749   3745     if $GREP 'External.*some_variable' conftest.out > /dev/null; then
  3750   3746       lt_cv_nm_interface="MS dumpbin"
  3751   3747     fi
  3752   3748     rm -f conftest*
  3753   3749   fi
  3754   3750   { $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
................................................................................
  4962   4958   	;;
  4963   4959       esac
  4964   4960     fi
  4965   4961     rm -rf conftest*
  4966   4962     ;;
  4967   4963   *-*-irix6*)
  4968   4964     # Find out which ABI we are using.
  4969         -  echo '#line 4969 "configure"' > conftest.$ac_ext
         4965  +  echo '#line 4965 "configure"' > conftest.$ac_ext
  4970   4966     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  4971   4967     (eval $ac_compile) 2>&5
  4972   4968     ac_status=$?
  4973   4969     $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  4974   4970     (exit $ac_status); }; then
  4975   4971       if test "$lt_cv_prog_gnu_ld" = yes; then
  4976   4972         case `/usr/bin/file conftest.$ac_objext` in
................................................................................
  6831   6827      # Note that $ac_compile itself does not contain backslashes and begins
  6832   6828      # with a dollar sign (not a hyphen), so the echo should work correctly.
  6833   6829      # The option is referenced via a variable to avoid confusing sed.
  6834   6830      lt_compile=`echo "$ac_compile" | $SED \
  6835   6831      -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
  6836   6832      -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
  6837   6833      -e 's:$: $lt_compiler_flag:'`
  6838         -   (eval echo "\"\$as_me:6838: $lt_compile\"" >&5)
         6834  +   (eval echo "\"\$as_me:6834: $lt_compile\"" >&5)
  6839   6835      (eval "$lt_compile" 2>conftest.err)
  6840   6836      ac_status=$?
  6841   6837      cat conftest.err >&5
  6842         -   echo "$as_me:6842: \$? = $ac_status" >&5
         6838  +   echo "$as_me:6838: \$? = $ac_status" >&5
  6843   6839      if (exit $ac_status) && test -s "$ac_outfile"; then
  6844   6840        # The compiler can only warn and ignore the option if not recognized
  6845   6841        # So say no if there are warnings other than the usual output.
  6846   6842        $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
  6847   6843        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
  6848   6844        if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
  6849   6845          lt_cv_prog_compiler_rtti_exceptions=yes
................................................................................
  7170   7166      # Note that $ac_compile itself does not contain backslashes and begins
  7171   7167      # with a dollar sign (not a hyphen), so the echo should work correctly.
  7172   7168      # The option is referenced via a variable to avoid confusing sed.
  7173   7169      lt_compile=`echo "$ac_compile" | $SED \
  7174   7170      -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
  7175   7171      -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
  7176   7172      -e 's:$: $lt_compiler_flag:'`
  7177         -   (eval echo "\"\$as_me:7177: $lt_compile\"" >&5)
         7173  +   (eval echo "\"\$as_me:7173: $lt_compile\"" >&5)
  7178   7174      (eval "$lt_compile" 2>conftest.err)
  7179   7175      ac_status=$?
  7180   7176      cat conftest.err >&5
  7181         -   echo "$as_me:7181: \$? = $ac_status" >&5
         7177  +   echo "$as_me:7177: \$? = $ac_status" >&5
  7182   7178      if (exit $ac_status) && test -s "$ac_outfile"; then
  7183   7179        # The compiler can only warn and ignore the option if not recognized
  7184   7180        # So say no if there are warnings other than the usual output.
  7185   7181        $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
  7186   7182        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
  7187   7183        if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
  7188   7184          lt_cv_prog_compiler_pic_works=yes
................................................................................
  7275   7271      # (2) before a word containing "conftest.", or (3) at the end.
  7276   7272      # Note that $ac_compile itself does not contain backslashes and begins
  7277   7273      # with a dollar sign (not a hyphen), so the echo should work correctly.
  7278   7274      lt_compile=`echo "$ac_compile" | $SED \
  7279   7275      -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
  7280   7276      -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
  7281   7277      -e 's:$: $lt_compiler_flag:'`
  7282         -   (eval echo "\"\$as_me:7282: $lt_compile\"" >&5)
         7278  +   (eval echo "\"\$as_me:7278: $lt_compile\"" >&5)
  7283   7279      (eval "$lt_compile" 2>out/conftest.err)
  7284   7280      ac_status=$?
  7285   7281      cat out/conftest.err >&5
  7286         -   echo "$as_me:7286: \$? = $ac_status" >&5
         7282  +   echo "$as_me:7282: \$? = $ac_status" >&5
  7287   7283      if (exit $ac_status) && test -s out/conftest2.$ac_objext
  7288   7284      then
  7289   7285        # The compiler can only warn and ignore the option if not recognized
  7290   7286        # So say no if there are warnings
  7291   7287        $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
  7292   7288        $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
  7293   7289        if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
................................................................................
  7330   7326      # (2) before a word containing "conftest.", or (3) at the end.
  7331   7327      # Note that $ac_compile itself does not contain backslashes and begins
  7332   7328      # with a dollar sign (not a hyphen), so the echo should work correctly.
  7333   7329      lt_compile=`echo "$ac_compile" | $SED \
  7334   7330      -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
  7335   7331      -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
  7336   7332      -e 's:$: $lt_compiler_flag:'`
  7337         -   (eval echo "\"\$as_me:7337: $lt_compile\"" >&5)
         7333  +   (eval echo "\"\$as_me:7333: $lt_compile\"" >&5)
  7338   7334      (eval "$lt_compile" 2>out/conftest.err)
  7339   7335      ac_status=$?
  7340   7336      cat out/conftest.err >&5
  7341         -   echo "$as_me:7341: \$? = $ac_status" >&5
         7337  +   echo "$as_me:7337: \$? = $ac_status" >&5
  7342   7338      if (exit $ac_status) && test -s out/conftest2.$ac_objext
  7343   7339      then
  7344   7340        # The compiler can only warn and ignore the option if not recognized
  7345   7341        # So say no if there are warnings
  7346   7342        $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
  7347   7343        $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
  7348   7344        if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
................................................................................
 10143  10139   else
 10144  10140     	  if test "$cross_compiling" = yes; then :
 10145  10141     lt_cv_dlopen_self=cross
 10146  10142   else
 10147  10143     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 10148  10144     lt_status=$lt_dlunknown
 10149  10145     cat > conftest.$ac_ext <<_LT_EOF
 10150         -#line 10150 "configure"
        10146  +#line 10146 "configure"
 10151  10147   #include "confdefs.h"
 10152  10148   
 10153  10149   #if HAVE_DLFCN_H
 10154  10150   #include <dlfcn.h>
 10155  10151   #endif
 10156  10152   
 10157  10153   #include <stdio.h>
................................................................................
 10239  10235   else
 10240  10236     	  if test "$cross_compiling" = yes; then :
 10241  10237     lt_cv_dlopen_self_static=cross
 10242  10238   else
 10243  10239     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 10244  10240     lt_status=$lt_dlunknown
 10245  10241     cat > conftest.$ac_ext <<_LT_EOF
 10246         -#line 10246 "configure"
        10242  +#line 10242 "configure"
 10247  10243   #include "confdefs.h"
 10248  10244   
 10249  10245   #if HAVE_DLFCN_H
 10250  10246   #include <dlfcn.h>
 10251  10247   #endif
 10252  10248   
 10253  10249   #include <stdio.h>
................................................................................
 12571  12567   $as_echo_n "checking whether to allow connections to be shared across threads... " >&6; }
 12572  12568   if test "$enable_xthreadconnect" = "no"; then
 12573  12569     XTHREADCONNECT=''
 12574  12570     { $as_echo "$as_me:$LINENO: result: no" >&5
 12575  12571   $as_echo "no" >&6; }
 12576  12572   else
 12577  12573     XTHREADCONNECT='-DSQLITE_ALLOW_XTHREAD_CONNECT=1'
 12578         -  { $as_echo "$as_me:$LINENO: result: yes" >&5
 12579         -$as_echo "yes" >&6; }
 12580         -fi
 12581         -
 12582         -
 12583         -##########
 12584         -# Do we want to set threadsOverrideEachOthersLocks variable to be 1 (true) by
 12585         -# default. Normally, a test at runtime is performed to determine the
 12586         -# appropriate value of this variable. Use this option only if you're sure that
 12587         -# threads can safely override each others locks in all runtime situations.
 12588         -#
 12589         -# Check whether --enable-threads-override-locks was given.
 12590         -if test "${enable_threads_override_locks+set}" = set; then
 12591         -  enableval=$enable_threads_override_locks;
 12592         -else
 12593         -  enable_threads_override_locks=no
 12594         -fi
 12595         -
 12596         -{ $as_echo "$as_me:$LINENO: checking whether threads can override each others locks" >&5
 12597         -$as_echo_n "checking whether threads can override each others locks... " >&6; }
 12598         -if test "$enable_threads_override_locks" = "no"; then
 12599         -  THREADSOVERRIDELOCKS='-1'
 12600         -  { $as_echo "$as_me:$LINENO: result: no" >&5
 12601         -$as_echo "no" >&6; }
 12602         -else
 12603         -  THREADSOVERRIDELOCKS='1'
 12604  12574     { $as_echo "$as_me:$LINENO: result: yes" >&5
 12605  12575   $as_echo "yes" >&6; }
 12606  12576   fi
 12607  12577   
 12608  12578   
 12609  12579   ##########
 12610  12580   # Do we want to support release

Changes to configure.ac.

   264    264     AC_MSG_RESULT([no])
   265    265   else
   266    266     XTHREADCONNECT='-DSQLITE_ALLOW_XTHREAD_CONNECT=1'
   267    267     AC_MSG_RESULT([yes])
   268    268   fi
   269    269   AC_SUBST(XTHREADCONNECT)
   270    270   
   271         -##########
   272         -# Do we want to set threadsOverrideEachOthersLocks variable to be 1 (true) by
   273         -# default. Normally, a test at runtime is performed to determine the
   274         -# appropriate value of this variable. Use this option only if you're sure that
   275         -# threads can safely override each others locks in all runtime situations.
   276         -#
   277         -AC_ARG_ENABLE(threads-override-locks, 
   278         -AC_HELP_STRING([--enable-threads-override-locks],[Threads can override each others locks]),,enable_threads_override_locks=no)
   279         -AC_MSG_CHECKING([whether threads can override each others locks])
   280         -if test "$enable_threads_override_locks" = "no"; then
   281         -  THREADSOVERRIDELOCKS='-1'
   282         -  AC_MSG_RESULT([no])
   283         -else
   284         -  THREADSOVERRIDELOCKS='1'
   285         -  AC_MSG_RESULT([yes])
   286         -fi
   287         -AC_SUBST(THREADSOVERRIDELOCKS)
   288         -
   289    271   ##########
   290    272   # Do we want to support release
   291    273   #
   292    274   AC_ARG_ENABLE(releasemode, 
   293    275   AC_HELP_STRING([--enable-releasemode],[Support libtool link to release mode]),,enable_releasemode=no)
   294    276   AC_MSG_CHECKING([whether to support shared library linked as release mode or not])
   295    277   if test "$enable_releasemode" = "no"; then