Fossil

Check-in [c2b1bfb2]
Login

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

Overview
Comment:When building with --internal-sqlite, require at least SQLite 3.24.0. Let's hope that the new sqlite3_keyword_*() functions don't change signature in SQLite 3.24.0 final.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256:c2b1bfb2f154746501bf8bdf527c02dbc74bf79597b6c07d50af4bf4bb0963a3
User & Date: jan.nijtmans 2018-05-04 08:20:31
Context
2018-05-04
11:50
Update custom mingw makefile check-in: 54067e0f user: jan.nijtmans tags: trunk
08:20
When building with --internal-sqlite, require at least SQLite 3.24.0. Let's hope that the new sqlite3_keyword_*() functions don't change signature in SQLite 3.24.0 final. check-in: c2b1bfb2 user: jan.nijtmans tags: trunk
2018-05-03
16:54
Change the version number to 2.6 and update the change log in preparation for a release. check-in: 98b4cb33 user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to auto.def.

89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
    # search for the system SQLite once with -ldl, and once without. If
    # the library can only be found with $extralibs set to -ldl, then
    # the code below will append -ldl to LIBS.
    #
    foreach extralibs {{} {-ldl}} {

      # Locate the system SQLite by searching for sqlite3_open(). Then check
      # if sqlite3_vtab_collation() can be found as well. If we can find open() but
      # not vtab_collation(), then the system SQLite is too old to link against
      # fossil.
      #
      if {[check-function-in-lib sqlite3_open sqlite3 $extralibs]} {
        if {![check-function-in-lib sqlite3_vtab_collation sqlite3 $extralibs]} {
          user-error "system sqlite3 too old (require >= 3.22.0)"
        }

        # Success. Update symbols and return.
        #
        define USE_SYSTEM_SQLITE 1
        define-append LIBS -lsqlite3
        define-append LIBS $extralibs







|
|



|
|







89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
    # search for the system SQLite once with -ldl, and once without. If
    # the library can only be found with $extralibs set to -ldl, then
    # the code below will append -ldl to LIBS.
    #
    foreach extralibs {{} {-ldl}} {

      # Locate the system SQLite by searching for sqlite3_open(). Then check
      # if sqlite3_keyword_check() can be found as well. If we can find open() but
      # not keyword_check(), then the system SQLite is too old to link against
      # fossil.
      #
      if {[check-function-in-lib sqlite3_open sqlite3 $extralibs]} {
        if {![check-function-in-lib sqlite3_keyword_check sqlite3 $extralibs]} {
          user-error "system sqlite3 too old (require >= 3.24.0)"
        }

        # Success. Update symbols and return.
        #
        define USE_SYSTEM_SQLITE 1
        define-append LIBS -lsqlite3
        define-append LIBS $extralibs