Skip to content

Commit 328a4c8

Browse files
sjlombardosjlombardo
committed
Snapshot of upstream SQLite 3.36.0
1 parent 718beb4 commit 328a4c8

File tree

333 files changed

+22890
-4623
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

+22890
-4623
lines changed

‎Makefile.in‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -432,14 +432,15 @@ TESTSRC = \
432432
$(TOP)/ext/fts3/fts3_term.c \
433433
$(TOP)/ext/fts3/fts3_test.c \
434434
$(TOP)/ext/session/test_session.c \
435-
$(TOP)/ext/rbu/test_rbu.c
435+
$(TOP)/ext/rbu/test_rbu.c
436436

437437
# Statically linked extensions
438438
#
439439
TESTSRC += \
440440
$(TOP)/ext/expert/sqlite3expert.c \
441441
$(TOP)/ext/expert/test_expert.c \
442442
$(TOP)/ext/misc/amatch.c \
443+
$(TOP)/ext/misc/appendvfs.c \
443444
$(TOP)/ext/misc/carray.c \
444445
$(TOP)/ext/misc/cksumvfs.c \
445446
$(TOP)/ext/misc/closure.c \
@@ -520,7 +521,8 @@ TESTSRC2 = \
520521
$(TOP)/ext/fts3/fts3_write.c \
521522
$(TOP)/ext/async/sqlite3async.c \
522523
$(TOP)/ext/session/sqlite3session.c \
523-
$(TOP)/ext/misc/stmt.c
524+
$(TOP)/ext/misc/stmt.c \
525+
fts5.c
524526

525527
# Header files used by all library source files.
526528
#
@@ -614,12 +616,10 @@ SHELL_OPT += -DSQLITE_ENABLE_DBPAGE_VTAB
614616
SHELL_OPT += -DSQLITE_ENABLE_DBSTAT_VTAB
615617
SHELL_OPT += -DSQLITE_ENABLE_BYTECODE_VTAB
616618
SHELL_OPT += -DSQLITE_ENABLE_OFFSET_SQL_FUNC
617-
SHELL_OPT += -DSQLITE_ENABLE_DESERIALIZE
618619
FUZZERSHELL_OPT = -DSQLITE_ENABLE_JSON1
619620
FUZZCHECK_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MEMSYS5 -DSQLITE_OSS_FUZZ
620621
FUZZCHECK_OPT += -DSQLITE_MAX_MEMORY=50000000
621622
FUZZCHECK_OPT += -DSQLITE_PRINTF_PRECISION_LIMIT=1000
622-
FUZZCHECK_OPT += -DSQLITE_ENABLE_DESERIALIZE
623623
FUZZCHECK_OPT += -DSQLITE_ENABLE_FTS4
624624
FUZZCHECK_OPT += -DSQLITE_ENABLE_FTS3_PARENTHESIS
625625
#FUZZCHECK_OPT += -DSQLITE_ENABLE_FTS5
@@ -693,7 +693,6 @@ dbfuzz$(TEXE): $(TOP)/test/dbfuzz.c sqlite3.c sqlite3.h
693693
DBFUZZ2_OPTS = \
694694
-DSQLITE_THREADSAFE=0 \
695695
-DSQLITE_OMIT_LOAD_EXTENSION \
696-
-DSQLITE_ENABLE_DESERIALIZE \
697696
-DSQLITE_DEBUG \
698697
-DSQLITE_ENABLE_DBSTAT_VTAB \
699698
-DSQLITE_ENABLE_BYTECODE_VTAB \
@@ -1087,6 +1086,7 @@ SHELL_SRC = \
10871086
$(TOP)/ext/misc/decimal.c \
10881087
$(TOP)/ext/misc/fileio.c \
10891088
$(TOP)/ext/misc/ieee754.c \
1089+
$(TOP)/ext/misc/regexp.c \
10901090
$(TOP)/ext/misc/series.c \
10911091
$(TOP)/ext/misc/shathree.c \
10921092
$(TOP)/ext/misc/sqlar.c \
@@ -1233,7 +1233,6 @@ TESTFIXTURE_FLAGS += -DSQLITE_DEFAULT_PAGE_SIZE=1024
12331233
TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_STMTVTAB
12341234
TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_DBPAGE_VTAB
12351235
TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_BYTECODE_VTAB
1236-
TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_DESERIALIZE
12371236
TESTFIXTURE_FLAGS += -DSQLITE_CKSUMVFS_STATIC
12381237

12391238
TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlite3.la
@@ -1267,7 +1266,7 @@ fuzztest: fuzzcheck$(TEXE) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuz
12671266
./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db
12681267

12691268
valgrindfuzz: fuzzcheck$(TEXT) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db
1270-
valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA)
1269+
valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M $(FUZZDATA)
12711270
valgrind ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db
12721271

12731272
# The veryquick.test TCL tests.
@@ -1378,6 +1377,9 @@ wordcount$(TEXE): $(TOP)/test/wordcount.c sqlite3.lo
13781377
speedtest1$(TEXE): $(TOP)/test/speedtest1.c sqlite3.c
13791378
$(LTLINK) $(ST_OPT) -o $@ $(TOP)/test/speedtest1.c sqlite3.c $(TLIBS)
13801379

1380+
startup$(TEXE): $(TOP)/test/startup.c sqlite3.c
1381+
$(CC) -Os -g -DSQLITE_THREADSAFE=0 -o $@ $(TOP)/test/startup.c sqlite3.c $(TLIBS)
1382+
13811383
KV_OPT += -DSQLITE_DIRECT_OVERFLOW_READ
13821384

13831385
kvtest$(TEXE): $(TOP)/test/kvtest.c sqlite3.c
@@ -1426,6 +1428,9 @@ threadtest3$(TEXE): sqlite3.lo $(THREADTEST3_SRC)
14261428
threadtest: threadtest3$(TEXE)
14271429
./threadtest3$(TEXE)
14281430

1431+
threadtest5: sqlite3.c $(TOP)/test/threadtest5.c
1432+
$(LTLINK) $(TOP)/test/threadtest5.c sqlite3.c -o $@ $(TLIBS)
1433+
14291434
releasetest:
14301435
$(TCLSH_CMD) $(TOP)/test/releasetest.tcl
14311436

@@ -1479,6 +1484,7 @@ clean:
14791484
rm -f sqldiff sqldiff.exe
14801485
rm -f dbhash dbhash.exe
14811486
rm -f fts5.* fts5parse.*
1487+
rm -f threadtest5
14821488

14831489
distclean: clean
14841490
rm -f config.h config.log config.status libtool Makefile sqlite3.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
#
@@ -1549,14 +1551,15 @@ TESTSRC = \
15491551
$(TOP)\ext\fts3\fts3_term.c \
15501552
$(TOP)\ext\fts3\fts3_test.c \
15511553
$(TOP)\ext\rbu\test_rbu.c \
1552-
$(TOP)\ext\session\test_session.c
1554+
$(TOP)\ext\session\test_session.c
15531555

15541556
# Statically linked extensions.
15551557
#
15561558
TESTEXT = \
15571559
$(TOP)\ext\expert\sqlite3expert.c \
15581560
$(TOP)\ext\expert\test_expert.c \
15591561
$(TOP)\ext\misc\amatch.c \
1562+
$(TOP)\ext\misc\appendvfs.c \
15601563
$(TOP)\ext\misc\carray.c \
15611564
$(TOP)\ext\misc\cksumvfs.c \
15621565
$(TOP)\ext\misc\closure.c \
@@ -1581,7 +1584,8 @@ TESTEXT = \
15811584
$(TOP)\ext\misc\spellfix.c \
15821585
$(TOP)\ext\misc\totype.c \
15831586
$(TOP)\ext\misc\unionvtab.c \
1584-
$(TOP)\ext\misc\wholenumber.c
1587+
$(TOP)\ext\misc\wholenumber.c \
1588+
fts5.c
15851589

15861590
# If use of zlib is enabled, add the "zipfile.c" source file.
15871591
#
@@ -1684,7 +1688,6 @@ FUZZDATA = \
16841688
SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_FTS4=1
16851689
SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS=1
16861690
SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_OFFSET_SQL_FUNC=1
1687-
SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_DESERIALIZE=1
16881691
!ENDIF
16891692

16901693
# <<mark>>
@@ -1693,7 +1696,6 @@ SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_DESERIALIZE=1
16931696
MPTESTER_COMPILE_OPTS = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5
16941697
FUZZERSHELL_COMPILE_OPTS = -DSQLITE_ENABLE_JSON1
16951698
FUZZCHECK_OPTS = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MEMSYS5 -DSQLITE_OSS_FUZZ -DSQLITE_MAX_MEMORY=50000000 -DSQLITE_PRINTF_PRECISION_LIMIT=1000
1696-
FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_DESERIALIZE
16971699
FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_FTS4
16981700
FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_RTREE
16991701
FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_GEOPOLY
@@ -2209,6 +2211,7 @@ SHELL_SRC = \
22092211
$(TOP)\ext\misc\decimal.c \
22102212
$(TOP)\ext\misc\fileio.c \
22112213
$(TOP)\ext\misc\ieee754.c \
2214+
$(TOP)\ext\misc\regexp.c \
22122215
$(TOP)\ext\misc\series.c \
22132216
$(TOP)\ext\misc\shathree.c \
22142217
$(TOP)\ext\misc\uint.c \
@@ -2387,7 +2390,6 @@ TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_STMTVTAB=1
23872390
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_DBPAGE_VTAB=1
23882391
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_BYTECODE_VTAB=1
23892392
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_JSON1=1
2390-
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_DESERIALIZE=1
23912393
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_CKSUMVFS_STATIC=1
23922394
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) $(TEST_CCONV_OPTS)
23932395

‎README.md‎

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

58-
mkdir ~/sqlite
58+
mkdir -p ~/sqlite ~/Fossils
5959
cd ~/sqlite
60-
fossil clone https://www.sqlite.org/src sqlite.fossil
61-
fossil open sqlite.fossil
62-
60+
fossil clone https://www.sqlite.org/src ~/Fossils/sqlite.fossil
61+
fossil open ~/Fossils/sqlite.fossil
62+
6363
After setting up a repository using the steps above, you can always
6464
update to the lastest version using:
6565

@@ -68,7 +68,7 @@ update to the lastest version using:
6868

6969
Or type "fossil ui" to get a web-based user interface.
7070

71-
## Compiling
71+
## Compiling for Unix-like systems
7272

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

97-
## Using MSVC
97+
## Using MSVC for Windows systems
9898

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

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

106106
mkdir bld
107107
cd bld
108-
nmake /f Makefile.msc TOP=..\sqlite
109-
nmake /f Makefile.msc sqlite3.c TOP=..\sqlite
110-
nmake /f Makefile.msc sqlite3.dll TOP=..\sqlite
111-
nmake /f Makefile.msc sqlite3.exe TOP=..\sqlite
112-
nmake /f Makefile.msc test TOP=..\sqlite
108+
nmake /f ..\sqlite\Makefile.msc TOP=..\sqlite
109+
nmake /f ..\sqlite\Makefile.msc sqlite3.c TOP=..\sqlite
110+
nmake /f ..\sqlite\Makefile.msc sqlite3.dll TOP=..\sqlite
111+
nmake /f ..\sqlite\Makefile.msc sqlite3.exe TOP=..\sqlite
112+
nmake /f ..\sqlite\Makefile.msc test TOP=..\sqlite
113113

114114
There are several build options that can be set via the NMAKE command
115115
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)