Fix the top-level makefiles to always include SQLITE_ENABLE_EXPLAIN_COMMENTS

when building the shell.  Still need to fix main.mk and the
amalgamation tarball.

FossilOrigin-Name: 992282399cd2d1fc52ff5a1a4bff59f30b62899a

diff --git a/Makefile.in b/Makefile.in
index 54f7643327aec9e0089e295b29329fd62e467949..e1293d69fa77f8c2f694cfa5f8374eee1895f076 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -549,7 +549,8 @@ TESTOPTS = --verbose=file --output=test-out.txt
 
 # Extra compiler options for various shell tools
 #
-SHELL_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5
+SHELL_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS4
+SHELL_OPT += -DSQLITE_ENABLE_EXPLAIN_COMMENTS
 FUZZERSHELL_OPT = -DSQLITE_ENABLE_JSON1
 FUZZCHECK_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MEMSYS5
 
@@ -575,9 +576,9 @@ libtclsqlite3.la:   tclsqlite.lo libsqlite3.la
                -version-info "8:6:8" \
                -avoid-version
 
-sqlite3$(TEXE):        $(TOP)/src/shell.c libsqlite3.la sqlite3.h
+sqlite3$(TEXE):        $(TOP)/src/shell.c sqlite3.c
        $(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \
-               $(TOP)/src/shell.c libsqlite3.la \
+               $(TOP)/src/shell.c sqlite3.c \
                $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
 
 sqldiff$(TEXE):        $(TOP)/tool/sqldiff.c sqlite3.c sqlite3.h

diff --git a/Makefile.msc b/Makefile.msc
index 9620ff62375e050d49452a38e827913b7588c6b9..94e78b216985a13331bd620bbfc5931576c2da03 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -1359,7 +1359,7 @@ FUZZDATA = \
 # when the shell is not being dynamically linked.
 #
 !IF $(DYNAMIC_SHELL)==0 && $(FOR_WIN10)==0
-SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_SHELL_JSON1 -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5
+SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_SHELL_JSON1 -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS
 !ENDIF
 
 # <<mark>>

diff --git a/manifest b/manifest
index ed8c28e0370dde1bae0c59f75e59ae92884980e8..c320d4221b27e2456da2cda532d0fe86401544c3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
-C Code\ssimplification:\s\sALTER\sTABLE\sADD\sCOLUMN\salways\supgrades\sthe\sfile_format\nto\s4\sif\sis\snot\sthere\salready.\s\sNo\sneed\sto\supgrade\sto\sonly\s2\sor\s3\ssince\sformat\n4\shas\snow\sbeen\ssupported\sfor\sover\s10\syears.
-D 2016-02-09T16:09:22.275
-F Makefile.in dac2776c84e0d533b158a9af6e57e05c4a6b19f3
+C Fix\sthe\stop-level\smakefiles\sto\salways\sinclude\sSQLITE_ENABLE_EXPLAIN_COMMENTS\nwhen\sbuilding\sthe\sshell.\s\sStill\sneed\sto\sfix\smain.mk\sand\sthe\namalgamation\starball.
+D 2016-02-09T17:12:22.679
+F Makefile.in 95ea52e9c02962e31f986fe8ea5805104c84f94b
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
-F Makefile.msc b0493f10caddb8adf992a4e6f1943141fc7c6816
+F Makefile.msc d2eef1643b13c02686a5f3f5fa58e6843e910e2a
 F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
 F VERSION 866588d1edf0ccb5b0d33896974338f97564f719
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -1427,7 +1427,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P ca72be8618e5d466d6f35819ca8bbd2b84269959
-R f95e307a4f6313b9df891047976f580b
+P e1d8ec85546caeca3bb7a05ad962a2aed91194ce
+R c5ef01ad4ed02f828dd7e74a721278c9
 U drh
-Z 5769e00c07411a2161fa568f8263dd90
+Z 91487ddf0aeacb78fa9d983e619d08c4

diff --git a/manifest.uuid b/manifest.uuid
index df0fc10065b53fb6806383ba58d01855068ecc1f..c2594181e40fef9b3f8642b9f89ec12512f80fe7 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e1d8ec85546caeca3bb7a05ad962a2aed91194ce
\ No newline at end of file
+992282399cd2d1fc52ff5a1a4bff59f30b62899a
\ No newline at end of file