Fossil

Check-in [8ed01e80]
Login

Check-in [8ed01e80]

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

Overview
Comment:Since fossil now uses the function sqlite_strlike(), don't allow it to build/run with SQLite versions < 3.10.0 any more.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 8ed01e8021d4154f57ba014e8cc6e6188df91a43
User & Date: jan.nijtmans 2016-02-23 10:47:09.812
Context
2016-02-26
16:05
Fix "fossil co" so that it honors the --quiet flag. ... (check-in: f3e8e3ea user: drh tags: trunk)
2016-02-23
10:47
Since fossil now uses the function sqlite_strlike(), don't allow it to build/run with SQLite versions < 3.10.0 any more. ... (check-in: 8ed01e80 user: jan.nijtmans tags: trunk)
2016-02-20
20:53
Preserve the trailing slash for checkouts so fossil can remove a checkout that no longer exists but is still a directory. ... (check-in: f7a5e10c user: andybradford tags: trunk)
Changes
Unified Diff Ignore Whitespace Patch Hide diffs
Changes to auto.def. 
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104

    # 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_strglob() can be found as well. If we can find open() but
      # not strglob(), 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_malloc64 sqlite3 $extralibs]} {
          user-error "system sqlite3 too old (require >= 3.8.7)"
        }

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







|
|



|
|








84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104

    # 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_strlike() can be found as well. If we can find open() but
      # not strlike(), 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_strlike sqlite3 $extralibs]} {
          user-error "system sqlite3 too old (require >= 3.10.0)"
        }

        # Success. Update symbols and return.
        #
        define USE_SYSTEM_SQLITE 1
        define-append LIBS -lsqlite3
        define-append LIBS $extralibs
Changes to src/main.c. 
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605

#endif
int main(int argc, char **argv)
#endif
{
  const char *zCmdName = "unknown";
  int idx;
  int rc;
  if( sqlite3_libversion_number()<3008007 ){
    fossil_fatal("Unsuitable SQLite version %s, must be at least 3.8.7",
                 sqlite3_libversion());
  }
  sqlite3_config(SQLITE_CONFIG_MULTITHREAD);
  sqlite3_config(SQLITE_CONFIG_LOG, fossil_sqlite_log, 0);
  memset(&g, 0, sizeof(g));
  g.now = time(0);
  g.httpHeader = empty_blob;







|
|








590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605

#endif
int main(int argc, char **argv)
#endif
{
  const char *zCmdName = "unknown";
  int idx;
  int rc;
  if( sqlite3_libversion_number()<3010000 ){
    fossil_fatal("Unsuitable SQLite version %s, must be at least 3.10.0",
                 sqlite3_libversion());
  }
  sqlite3_config(SQLITE_CONFIG_MULTITHREAD);
  sqlite3_config(SQLITE_CONFIG_LOG, fossil_sqlite_log, 0);
  memset(&g, 0, sizeof(g));
  g.now = time(0);
  g.httpHeader = empty_blob;