393ce7d4248… — Fossil SCM

M auto.def

+5 -5

		--- auto.def
		+++ auto.def
		@@ -41,17 +41,17 @@
41	41	# the code below will append -ldl to LIBS.
42	42	#
43	43	foreach extralibs {{} {-ldl}} {
44	44
45	45	# Locate the system SQLite by searching for sqlite3_open(). Then check
46		- # if sqlite3_wal_checkpoint() can be found as well. If we can find
47		- # open() but not wal_checkpoint(), then the system SQLite is too old
48		- # to link against fossil.
	46	+ # if sqlite3_strglob() can be found as well. If we can find open() but
	47	+ # not strglob(), then the system SQLite is too old to link against
	48	+ # fossil.
49	49	#
50	50	if {[cc-check-function-in-lib sqlite3_open sqlite3 $extralibs]} {
51		- if {![cc-check-function-in-lib sqlite3_wal_checkpoint sqlite3 $extralibs]} {
52		- user-error "system sqlite3 too old (require >= 3.7.0)"
	51	+ if {![cc-check-function-in-lib sqlite3_strglob sqlite3 $extralibs]} {
	52	+ user-error "system sqlite3 too old (require >= 3.7.17)"
53	53	}
54	54
55	55	# Success. Update symbols and return.
56	56	#
57	57	define USE_SYSTEM_SQLITE 1
58	58

	--- auto.def
	+++ auto.def
	@@ -41,17 +41,17 @@
41	# the code below will append -ldl to LIBS.
42	#
43	foreach extralibs {{} {-ldl}} {
44
45	# Locate the system SQLite by searching for sqlite3_open(). Then check
46	# if sqlite3_wal_checkpoint() can be found as well. If we can find
47	# open() but not wal_checkpoint(), then the system SQLite is too old
48	# to link against fossil.
49	#
50	if {[cc-check-function-in-lib sqlite3_open sqlite3 $extralibs]} {
51	if {![cc-check-function-in-lib sqlite3_wal_checkpoint sqlite3 $extralibs]} {
52	user-error "system sqlite3 too old (require >= 3.7.0)"
53	}
54
55	# Success. Update symbols and return.
56	#
57	define USE_SYSTEM_SQLITE 1
58

	--- auto.def
	+++ auto.def
	@@ -41,17 +41,17 @@
41	# the code below will append -ldl to LIBS.
42	#
43	foreach extralibs {{} {-ldl}} {
44
45	# Locate the system SQLite by searching for sqlite3_open(). Then check
46	# if sqlite3_strglob() can be found as well. If we can find open() but
47	# not strglob(), then the system SQLite is too old to link against
48	# fossil.
49	#
50	if {[cc-check-function-in-lib sqlite3_open sqlite3 $extralibs]} {
51	if {![cc-check-function-in-lib sqlite3_strglob sqlite3 $extralibs]} {
52	user-error "system sqlite3 too old (require >= 3.7.17)"
53	}
54
55	# Success. Update symbols and return.
56	#
57	define USE_SYSTEM_SQLITE 1
58

M src/main.c

+2 -2

		--- src/main.c
		+++ src/main.c
		@@ -568,12 +568,12 @@
568	568	#endif
569	569	{
570	570	const char *zCmdName = "unknown";
571	571	int idx;
572	572	int rc;
573		- if( sqlite3_libversion_number()<3008002 ){
574		- fossil_fatal("Unsuitable SQLite version %s, must be at least 3.8.2",
	573	+ if( sqlite3_libversion_number()<3007017 ){
	574	+ fossil_fatal("Unsuitable SQLite version %s, must be at least 3.7.17",
575	575	sqlite3_libversion());
576	576	}
577	577	sqlite3_config(SQLITE_CONFIG_SINGLETHREAD);
578	578	sqlite3_config(SQLITE_CONFIG_LOG, fossil_sqlite_log, 0);
579	579	memset(&g, 0, sizeof(g));
580	580

	--- src/main.c
	+++ src/main.c
	@@ -568,12 +568,12 @@
568	#endif
569	{
570	const char *zCmdName = "unknown";
571	int idx;
572	int rc;
573	if( sqlite3_libversion_number()<3008002 ){
574	fossil_fatal("Unsuitable SQLite version %s, must be at least 3.8.2",
575	sqlite3_libversion());
576	}
577	sqlite3_config(SQLITE_CONFIG_SINGLETHREAD);
578	sqlite3_config(SQLITE_CONFIG_LOG, fossil_sqlite_log, 0);
579	memset(&g, 0, sizeof(g));
580

	--- src/main.c
	+++ src/main.c
	@@ -568,12 +568,12 @@
568	#endif
569	{
570	const char *zCmdName = "unknown";
571	int idx;
572	int rc;
573	if( sqlite3_libversion_number()<3007017 ){
574	fossil_fatal("Unsuitable SQLite version %s, must be at least 3.7.17",
575	sqlite3_libversion());
576	}
577	sqlite3_config(SQLITE_CONFIG_SINGLETHREAD);
578	sqlite3_config(SQLITE_CONFIG_LOG, fossil_sqlite_log, 0);
579	memset(&g, 0, sizeof(g));
580

M src/shell.c

+4 -2

		--- src/shell.c
		+++ src/shell.c
		@@ -1141,12 +1141,14 @@
1141	1141	fprintf(pArg->out, "Fullscan Steps: %d\n", iCur);
1142	1142	iCur = sqlite3_stmt_status(pArg->pStmt, SQLITE_STMTSTATUS_SORT, bReset);
1143	1143	fprintf(pArg->out, "Sort Operations: %d\n", iCur);
1144	1144	iCur = sqlite3_stmt_status(pArg->pStmt, SQLITE_STMTSTATUS_AUTOINDEX, bReset);
1145	1145	fprintf(pArg->out, "Autoindex Inserts: %d\n", iCur);
1146		- iCur = sqlite3_stmt_status(pArg->pStmt, SQLITE_STMTSTATUS_VM_STEP, bReset);
1147		- fprintf(pArg->out, "Virtual Machine Steps: %d\n", iCur);
	1146	+ if( sqlite3_libversion_number()>=3008000 ){
	1147	+ iCur = sqlite3_stmt_status(pArg->pStmt, SQLITE_STMTSTATUS_VM_STEP, bReset);
	1148	+ fprintf(pArg->out, "Virtual Machine Steps: %d\n", iCur);
	1149	+ }
1148	1150	}
1149	1151
1150	1152	return 0;
1151	1153	}
1152	1154
1153	1155

	--- src/shell.c
	+++ src/shell.c
	@@ -1141,12 +1141,14 @@
1141	fprintf(pArg->out, "Fullscan Steps: %d\n", iCur);
1142	iCur = sqlite3_stmt_status(pArg->pStmt, SQLITE_STMTSTATUS_SORT, bReset);
1143	fprintf(pArg->out, "Sort Operations: %d\n", iCur);
1144	iCur = sqlite3_stmt_status(pArg->pStmt, SQLITE_STMTSTATUS_AUTOINDEX, bReset);
1145	fprintf(pArg->out, "Autoindex Inserts: %d\n", iCur);
1146	iCur = sqlite3_stmt_status(pArg->pStmt, SQLITE_STMTSTATUS_VM_STEP, bReset);
1147	fprintf(pArg->out, "Virtual Machine Steps: %d\n", iCur);


1148	}
1149
1150	return 0;
1151	}
1152
1153

	--- src/shell.c
	+++ src/shell.c
	@@ -1141,12 +1141,14 @@
1141	fprintf(pArg->out, "Fullscan Steps: %d\n", iCur);
1142	iCur = sqlite3_stmt_status(pArg->pStmt, SQLITE_STMTSTATUS_SORT, bReset);
1143	fprintf(pArg->out, "Sort Operations: %d\n", iCur);
1144	iCur = sqlite3_stmt_status(pArg->pStmt, SQLITE_STMTSTATUS_AUTOINDEX, bReset);
1145	fprintf(pArg->out, "Autoindex Inserts: %d\n", iCur);
1146	if( sqlite3_libversion_number()>=3008000 ){
1147	iCur = sqlite3_stmt_status(pArg->pStmt, SQLITE_STMTSTATUS_VM_STEP, bReset);
1148	fprintf(pArg->out, "Virtual Machine Steps: %d\n", iCur);
1149	}
1150	}
1151
1152	return 0;
1153	}
1154
1155

Fossil SCM