Fossil SCM

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.

jan.nijtmans 2018-05-04 08:20 trunk
Commit c2b1bfb2f154746501bf8bdf527c02dbc74bf79597b6c07d50af4bf4bb0963a3
1 file changed +4 -4
+4 -4
--- auto.def
+++ auto.def
@@ -91,17 +91,17 @@
9191
# the code below will append -ldl to LIBS.
9292
#
9393
foreach extralibs {{} {-ldl}} {
9494
9595
# Locate the system SQLite by searching for sqlite3_open(). Then check
96
- # if sqlite3_vtab_collation() can be found as well. If we can find open() but
97
- # not vtab_collation(), then the system SQLite is too old to link against
96
+ # if sqlite3_keyword_check() can be found as well. If we can find open() but
97
+ # not keyword_check(), then the system SQLite is too old to link against
9898
# fossil.
9999
#
100100
if {[check-function-in-lib sqlite3_open sqlite3 $extralibs]} {
101
- if {![check-function-in-lib sqlite3_vtab_collation sqlite3 $extralibs]} {
102
- user-error "system sqlite3 too old (require >= 3.22.0)"
101
+ if {![check-function-in-lib sqlite3_keyword_check sqlite3 $extralibs]} {
102
+ user-error "system sqlite3 too old (require >= 3.24.0)"
103103
}
104104
105105
# Success. Update symbols and return.
106106
#
107107
define USE_SYSTEM_SQLITE 1
108108
--- auto.def
+++ auto.def
@@ -91,17 +91,17 @@
91 # the code below will append -ldl to LIBS.
92 #
93 foreach extralibs {{} {-ldl}} {
94
95 # Locate the system SQLite by searching for sqlite3_open(). Then check
96 # if sqlite3_vtab_collation() can be found as well. If we can find open() but
97 # not vtab_collation(), then the system SQLite is too old to link against
98 # fossil.
99 #
100 if {[check-function-in-lib sqlite3_open sqlite3 $extralibs]} {
101 if {![check-function-in-lib sqlite3_vtab_collation sqlite3 $extralibs]} {
102 user-error "system sqlite3 too old (require >= 3.22.0)"
103 }
104
105 # Success. Update symbols and return.
106 #
107 define USE_SYSTEM_SQLITE 1
108
--- auto.def
+++ auto.def
@@ -91,17 +91,17 @@
91 # the code below will append -ldl to LIBS.
92 #
93 foreach extralibs {{} {-ldl}} {
94
95 # Locate the system SQLite by searching for sqlite3_open(). Then check
96 # if sqlite3_keyword_check() can be found as well. If we can find open() but
97 # not keyword_check(), then the system SQLite is too old to link against
98 # fossil.
99 #
100 if {[check-function-in-lib sqlite3_open sqlite3 $extralibs]} {
101 if {![check-function-in-lib sqlite3_keyword_check sqlite3 $extralibs]} {
102 user-error "system sqlite3 too old (require >= 3.24.0)"
103 }
104
105 # Success. Update symbols and return.
106 #
107 define USE_SYSTEM_SQLITE 1
108

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button