Skip to content

Commit 62b0dea

Browse files
sjlombardosjlombardo
committed
Merge sqlite-release(3.36.0) into prerelease-integration
2 parents 3cfbe79 + 328a4c8 commit 62b0dea

File tree

333 files changed

+22876
-4609
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

333 files changed

+22876
-4609
lines changed

‎Makefile.in‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -454,14 +454,15 @@ TESTSRC = \
454454
$(TOP)/ext/fts3/fts3_term.c \
455455
$(TOP)/ext/fts3/fts3_test.c \
456456
$(TOP)/ext/session/test_session.c \
457-
$(TOP)/ext/rbu/test_rbu.c
457+
$(TOP)/ext/rbu/test_rbu.c
458458

459459
# Statically linked extensions
460460
#
461461
TESTSRC += \
462462
$(TOP)/ext/expert/sqlite3expert.c \
463463
$(TOP)/ext/expert/test_expert.c \
464464
$(TOP)/ext/misc/amatch.c \
465+
$(TOP)/ext/misc/appendvfs.c \
465466
$(TOP)/ext/misc/carray.c \
466467
$(TOP)/ext/misc/cksumvfs.c \
467468
$(TOP)/ext/misc/closure.c \
@@ -542,7 +543,8 @@ TESTSRC2 = \
542543
$(TOP)/ext/fts3/fts3_write.c \
543544
$(TOP)/ext/async/sqlite3async.c \
544545
$(TOP)/ext/session/sqlite3session.c \
545-
$(TOP)/ext/misc/stmt.c
546+
$(TOP)/ext/misc/stmt.c \
547+
fts5.c
546548

547549
# Header files used by all library source files.
548550
#
@@ -636,12 +638,10 @@ SHELL_OPT += -DSQLITE_ENABLE_DBPAGE_VTAB
636638
SHELL_OPT += -DSQLITE_ENABLE_DBSTAT_VTAB
637639
SHELL_OPT += -DSQLITE_ENABLE_BYTECODE_VTAB
638640
SHELL_OPT += -DSQLITE_ENABLE_OFFSET_SQL_FUNC
639-
SHELL_OPT += -DSQLITE_ENABLE_DESERIALIZE
640641
FUZZERSHELL_OPT = -DSQLITE_ENABLE_JSON1
641642
FUZZCHECK_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MEMSYS5 -DSQLITE_OSS_FUZZ
642643
FUZZCHECK_OPT += -DSQLITE_MAX_MEMORY=50000000
643644
FUZZCHECK_OPT += -DSQLITE_PRINTF_PRECISION_LIMIT=1000
644-
FUZZCHECK_OPT += -DSQLITE_ENABLE_DESERIALIZE
645645
FUZZCHECK_OPT += -DSQLITE_ENABLE_FTS4
646646
FUZZCHECK_OPT += -DSQLITE_ENABLE_FTS3_PARENTHESIS
647647
#FUZZCHECK_OPT += -DSQLITE_ENABLE_FTS5
@@ -715,7 +715,6 @@ dbfuzz$(TEXE): $(TOP)/test/dbfuzz.c sqlite3.c sqlite3.h
715715
DBFUZZ2_OPTS = \
716716
-DSQLITE_THREADSAFE=0 \
717717
-DSQLITE_OMIT_LOAD_EXTENSION \
718-
-DSQLITE_ENABLE_DESERIALIZE \
719718
-DSQLITE_DEBUG \
720719
-DSQLITE_ENABLE_DBSTAT_VTAB \
721720
-DSQLITE_ENABLE_BYTECODE_VTAB \
@@ -1124,6 +1123,7 @@ SHELL_SRC = \
11241123
$(TOP)/ext/misc/decimal.c \
11251124
$(TOP)/ext/misc/fileio.c \
11261125
$(TOP)/ext/misc/ieee754.c \
1126+
$(TOP)/ext/misc/regexp.c \
11271127
$(TOP)/ext/misc/series.c \
11281128
$(TOP)/ext/misc/shathree.c \
11291129
$(TOP)/ext/misc/sqlar.c \
@@ -1270,7 +1270,6 @@ TESTFIXTURE_FLAGS += -DSQLITE_DEFAULT_PAGE_SIZE=1024
12701270
TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_STMTVTAB
12711271
TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_DBPAGE_VTAB
12721272
TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_BYTECODE_VTAB
1273-
TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_DESERIALIZE
12741273
TESTFIXTURE_FLAGS += -DSQLITE_CKSUMVFS_STATIC
12751274

12761275
TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlcipher.la
@@ -1304,7 +1303,7 @@ fuzztest: fuzzcheck$(TEXE) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuz
13041303
./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db
13051304

13061305
valgrindfuzz: fuzzcheck$(TEXT) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db
1307-
valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA)
1306+
valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M $(FUZZDATA)
13081307
valgrind ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db
13091308

13101309
# The veryquick.test TCL tests.
@@ -1415,6 +1414,9 @@ wordcount$(TEXE): $(TOP)/test/wordcount.c sqlite3.lo
14151414
speedtest1$(TEXE): $(TOP)/test/speedtest1.c sqlite3.c
14161415
$(LTLINK) $(ST_OPT) -o $@ $(TOP)/test/speedtest1.c sqlite3.c $(TLIBS)
14171416

1417+
startup$(TEXE): $(TOP)/test/startup.c sqlite3.c
1418+
$(CC) -Os -g -DSQLITE_THREADSAFE=0 -o $@ $(TOP)/test/startup.c sqlite3.c $(TLIBS)
1419+
14181420
KV_OPT += -DSQLITE_DIRECT_OVERFLOW_READ
14191421

14201422
kvtest$(TEXE): $(TOP)/test/kvtest.c sqlite3.c
@@ -1463,6 +1465,9 @@ threadtest3$(TEXE): sqlite3.lo $(THREADTEST3_SRC)
14631465
threadtest: threadtest3$(TEXE)
14641466
./threadtest3$(TEXE)
14651467

1468+
threadtest5: sqlite3.c $(TOP)/test/threadtest5.c
1469+
$(LTLINK) $(TOP)/test/threadtest5.c sqlite3.c -o $@ $(TLIBS)
1470+
14661471
releasetest:
14671472
$(TCLSH_CMD) $(TOP)/test/releasetest.tcl
14681473

@@ -1516,6 +1521,7 @@ clean:
15161521
rm -f sqldiff sqldiff.exe
15171522
rm -f dbhash dbhash.exe
15181523
rm -f fts5.* fts5parse.*
1524+
rm -f threadtest5
15191525

15201526
distclean: clean
15211527
rm -f config.h config.log config.status libtool Makefile sqlcipher.pc

‎Makefile.msc‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,6 @@ OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_STMTVTAB=1
367367
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DBPAGE_VTAB=1
368368
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DBSTAT_VTAB=1
369369
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_BYTECODE_VTAB=1
370-
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DESERIALIZE=1
371370
!ENDIF
372371
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_COLUMN_METADATA=1
373372
!ENDIF
@@ -380,6 +379,9 @@ OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_SESSION=1
380379
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_PREUPDATE_HOOK=1
381380
!ENDIF
382381

382+
# Always enable math functions on Windows
383+
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_MATH_FUNCTIONS
384+
383385
# Should the rbu extension be enabled? If so, add compilation options
384386
# to enable it.
385387
#
@@ -1557,14 +1559,15 @@ TESTSRC = \
15571559
$(TOP)\ext\fts3\fts3_term.c \
15581560
$(TOP)\ext\fts3\fts3_test.c \
15591561
$(TOP)\ext\rbu\test_rbu.c \
1560-
$(TOP)\ext\session\test_session.c
1562+
$(TOP)\ext\session\test_session.c
15611563

15621564
# Statically linked extensions.
15631565
#
15641566
TESTEXT = \
15651567
$(TOP)\ext\expert\sqlite3expert.c \
15661568
$(TOP)\ext\expert\test_expert.c \
15671569
$(TOP)\ext\misc\amatch.c \
1570+
$(TOP)\ext\misc\appendvfs.c \
15681571
$(TOP)\ext\misc\carray.c \
15691572
$(TOP)\ext\misc\cksumvfs.c \
15701573
$(TOP)\ext\misc\closure.c \
@@ -1589,7 +1592,8 @@ TESTEXT = \
15891592
$(TOP)\ext\misc\spellfix.c \
15901593
$(TOP)\ext\misc\totype.c \
15911594
$(TOP)\ext\misc\unionvtab.c \
1592-
$(TOP)\ext\misc\wholenumber.c
1595+
$(TOP)\ext\misc\wholenumber.c \
1596+
fts5.c
15931597

15941598
# If use of zlib is enabled, add the "zipfile.c" source file.
15951599
#
@@ -1692,7 +1696,6 @@ FUZZDATA = \
16921696
SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_FTS4=1
16931697
SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS=1
16941698
SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_OFFSET_SQL_FUNC=1
1695-
SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_DESERIALIZE=1
16961699
!ENDIF
16971700

16981701
# <<mark>>
@@ -1701,7 +1704,6 @@ SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_DESERIALIZE=1
17011704
MPTESTER_COMPILE_OPTS = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5
17021705
FUZZERSHELL_COMPILE_OPTS = -DSQLITE_ENABLE_JSON1
17031706
FUZZCHECK_OPTS = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MEMSYS5 -DSQLITE_OSS_FUZZ -DSQLITE_MAX_MEMORY=50000000 -DSQLITE_PRINTF_PRECISION_LIMIT=1000
1704-
FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_DESERIALIZE
17051707
FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_FTS4
17061708
FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_RTREE
17071709
FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_GEOPOLY
@@ -2217,6 +2219,7 @@ SHELL_SRC = \
22172219
$(TOP)\ext\misc\decimal.c \
22182220
$(TOP)\ext\misc\fileio.c \
22192221
$(TOP)\ext\misc\ieee754.c \
2222+
$(TOP)\ext\misc\regexp.c \
22202223
$(TOP)\ext\misc\series.c \
22212224
$(TOP)\ext\misc\shathree.c \
22222225
$(TOP)\ext\misc\uint.c \
@@ -2395,7 +2398,6 @@ TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_STMTVTAB=1
23952398
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_DBPAGE_VTAB=1
23962399
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_BYTECODE_VTAB=1
23972400
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_JSON1=1
2398-
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_DESERIALIZE=1
23992401
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_CKSUMVFS_STATIC=1
24002402
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) $(TEST_CCONV_OPTS)
24012403

‎README.md‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -217,11 +217,11 @@ a stand-alone program. To install, simply download or build the single
217217
executable file and put that file someplace on your $PATH.)
218218
Then run commands like this:
219219

220-
mkdir ~/sqlite
220+
mkdir -p ~/sqlite ~/Fossils
221221
cd ~/sqlite
222-
fossil clone https://www.sqlite.org/src sqlite.fossil
223-
fossil open sqlite.fossil
224-
222+
fossil clone https://www.sqlite.org/src ~/Fossils/sqlite.fossil
223+
fossil open ~/Fossils/sqlite.fossil
224+
225225
After setting up a repository using the steps above, you can always
226226
update to the lastest version using:
227227

@@ -230,7 +230,7 @@ update to the lastest version using:
230230

231231
Or type "fossil ui" to get a web-based user interface.
232232

233-
## Compiling
233+
## Compiling for Unix-like systems
234234

235235
First create a directory in which to place
236236
the build products. It is recommended, but not required, that the
@@ -256,22 +256,22 @@ script does not work out for you, there is a generic makefile named
256256
can copy and edit to suit your needs. Comments on the generic makefile
257257
show what changes are needed.
258258

259-
## Using MSVC
259+
## Using MSVC for Windows systems
260260

261261
On Windows, all applicable build products can be compiled with MSVC.
262262
First open the command prompt window associated with the desired compiler
263263
version (e.g. "Developer Command Prompt for VS2013"). Next, use NMAKE
264264
with the provided "Makefile.msc" to build one of the supported targets.
265265

266-
For example:
266+
For example, from the parent directory of the source subtree named "sqlite":
267267

268268
mkdir bld
269269
cd bld
270-
nmake /f Makefile.msc TOP=..\sqlite
271-
nmake /f Makefile.msc sqlite3.c TOP=..\sqlite
272-
nmake /f Makefile.msc sqlite3.dll TOP=..\sqlite
273-
nmake /f Makefile.msc sqlite3.exe TOP=..\sqlite
274-
nmake /f Makefile.msc test TOP=..\sqlite
270+
nmake /f ..\sqlite\Makefile.msc TOP=..\sqlite
271+
nmake /f ..\sqlite\Makefile.msc sqlite3.c TOP=..\sqlite
272+
nmake /f ..\sqlite\Makefile.msc sqlite3.dll TOP=..\sqlite
273+
nmake /f ..\sqlite\Makefile.msc sqlite3.exe TOP=..\sqlite
274+
nmake /f ..\sqlite\Makefile.msc test TOP=..\sqlite
275275

276276
There are several build options that can be set via the NMAKE command
277277
line. For example, to build for WinRT, simply add "FOR_WINRT=1" argument

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.34.1
1+
3.36.0

‎autoconf/Makefile.msc‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,6 @@ OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_STMTVTAB=1
290290
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DBPAGE_VTAB=1
291291
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DBSTAT_VTAB=1
292292
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_BYTECODE_VTAB=1
293-
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DESERIALIZE=1
294293
!ENDIF
295294
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_COLUMN_METADATA=1
296295
!ENDIF
@@ -303,6 +302,9 @@ OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_SESSION=1
303302
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_PREUPDATE_HOOK=1
304303
!ENDIF
305304

305+
# Always enable math functions on Windows
306+
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_MATH_FUNCTIONS
307+
306308
# Should the rbu extension be enabled? If so, add compilation options
307309
# to enable it.
308310
#
@@ -957,7 +959,6 @@ LIBRESOBJS =
957959
SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_FTS4=1
958960
SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS=1
959961
SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_OFFSET_SQL_FUNC=1
960-
SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_DESERIALIZE=1
961962
!ENDIF
962963

963964

‎autoconf/configure.ac‎

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,9 @@ AC_SUBST(READLINE_LIBS)
8787
AC_ARG_ENABLE(threadsafe, [AS_HELP_STRING(
8888
[--enable-threadsafe], [build a thread-safe library [default=yes]])],
8989
[], [enable_threadsafe=yes])
90-
if test x"$enable_threadsafe" != "xno"; then
90+
if test x"$enable_threadsafe" == "xno"; then
91+
BUILD_CFLAGS="$BUILD_CFLAGS -DSQLITE_THREADSAFE=0"
92+
else
9193
BUILD_CFLAGS="$BUILD_CFLAGS -D_REENTRANT=1 -DSQLITE_THREADSAFE=1"
9294
AC_SEARCH_LIBS(pthread_create, pthread)
9395
AC_SEARCH_LIBS(pthread_mutexattr_init, pthread)
@@ -109,14 +111,34 @@ AC_MSG_CHECKING([for whether to support dynamic extensions])
109111
AC_MSG_RESULT($enable_dynamic_extensions)
110112
#-----------------------------------------------------------------------
111113

114+
#-----------------------------------------------------------------------
115+
# --enable-math
116+
#
117+
AC_ARG_ENABLE(math, [AS_HELP_STRING(
118+
[--enable-math], [SQL math functions [default=yes]])],
119+
[], [enable_math=yes])
120+
AC_MSG_CHECKING([SQL math functions])
121+
if test x"$enable_math" = "xyes"; then
122+
BUILD_CFLAGS="$BUILD_CFLAGS -DSQLITE_ENABLE_MATH_FUNCTIONS"
123+
AC_MSG_RESULT([enabled])
124+
AC_SEARCH_LIBS(ceil, m)
125+
else
126+
AC_MSG_RESULT([disabled])
127+
fi
128+
#-----------------------------------------------------------------------
129+
112130
#-----------------------------------------------------------------------
113131
# --enable-fts4
114132
#
115133
AC_ARG_ENABLE(fts4, [AS_HELP_STRING(
116134
[--enable-fts4], [include fts4 support [default=yes]])],
117135
[], [enable_fts4=yes])
136+
AC_MSG_CHECKING([FTS4 extension])
118137
if test x"$enable_fts4" = "xyes"; then
119138
BUILD_CFLAGS="$BUILD_CFLAGS -DSQLITE_ENABLE_FTS4"
139+
AC_MSG_RESULT([enabled])
140+
else
141+
AC_MSG_RESULT([disabled])
120142
fi
121143
#-----------------------------------------------------------------------
122144

@@ -126,8 +148,12 @@ fi
126148
AC_ARG_ENABLE(fts3, [AS_HELP_STRING(
127149
[--enable-fts3], [include fts3 support [default=no]])],
128150
[], [])
151+
AC_MSG_CHECKING([FTS3 extension])
129152
if test x"$enable_fts3" = "xyes" -a x"$enable_fts4" = "xno"; then
130153
BUILD_CFLAGS="$BUILD_CFLAGS -DSQLITE_ENABLE_FTS3"
154+
AC_MSG_RESULT([enabled])
155+
else
156+
AC_MSG_RESULT([disabled])
131157
fi
132158
#-----------------------------------------------------------------------
133159

@@ -137,9 +163,13 @@ fi
137163
AC_ARG_ENABLE(fts5, [AS_HELP_STRING(
138164
[--enable-fts5], [include fts5 support [default=yes]])],
139165
[], [enable_fts5=yes])
166+
AC_MSG_CHECKING([FTS5 extension])
140167
if test x"$enable_fts5" = "xyes"; then
168+
AC_MSG_RESULT([enabled])
141169
AC_SEARCH_LIBS(log, m)
142170
BUILD_CFLAGS="$BUILD_CFLAGS -DSQLITE_ENABLE_FTS5"
171+
else
172+
AC_MSG_RESULT([disabled])
143173
fi
144174
#-----------------------------------------------------------------------
145175

@@ -149,8 +179,12 @@ fi
149179
AC_ARG_ENABLE(json1, [AS_HELP_STRING(
150180
[--enable-json1], [include json1 support [default=yes]])],
151181
[],[enable_json1=yes])
182+
AC_MSG_CHECKING([JSON functions])
152183
if test x"$enable_json1" = "xyes"; then
153184
BUILD_CFLAGS="$BUILD_CFLAGS -DSQLITE_ENABLE_JSON1"
185+
AC_MSG_RESULT([enabled])
186+
else
187+
AC_MSG_RESULT([disabled])
154188
fi
155189
#-----------------------------------------------------------------------
156190

@@ -160,8 +194,12 @@ fi
160194
AC_ARG_ENABLE(rtree, [AS_HELP_STRING(
161195
[--enable-rtree], [include rtree support [default=yes]])],
162196
[], [enable_rtree=yes])
197+
AC_MSG_CHECKING([RTREE extension])
163198
if test x"$enable_rtree" = "xyes"; then
164199
BUILD_CFLAGS="$BUILD_CFLAGS -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY"
200+
AC_MSG_RESULT([enabled])
201+
else
202+
AC_MSG_RESULT([disabled])
165203
fi
166204
#-----------------------------------------------------------------------
167205

@@ -171,8 +209,12 @@ fi
171209
AC_ARG_ENABLE(session, [AS_HELP_STRING(
172210
[--enable-session], [enable the session extension [default=no]])],
173211
[], [])
212+
AC_MSG_CHECKING([Session extension])
174213
if test x"$enable_session" = "xyes"; then
175214
BUILD_CFLAGS="$BUILD_CFLAGS -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_PREUPDATE_HOOK"
215+
AC_MSG_RESULT([enabled])
216+
else
217+
AC_MSG_RESULT([disabled])
176218
fi
177219
#-----------------------------------------------------------------------
178220

@@ -182,9 +224,13 @@ fi
182224
AC_ARG_ENABLE(debug, [AS_HELP_STRING(
183225
[--enable-debug], [build with debugging features enabled [default=no]])],
184226
[], [])
227+
AC_MSG_CHECKING([Build type])
185228
if test x"$enable_debug" = "xyes"; then
186229
BUILD_CFLAGS="$BUILD_CFLAGS -DSQLITE_DEBUG -DSQLITE_ENABLE_SELECTTRACE -DSQLITE_ENABLE_WHERETRACE"
187230
CFLAGS="-g -O0"
231+
AC_MSG_RESULT([debug])
232+
else
233+
AC_MSG_RESULT([release])
188234
fi
189235
#-----------------------------------------------------------------------
190236

0 commit comments

Comments
 (0)