Changes to Makefile.in to allow testfixture to be built with

SQLITE_USER_AUTHENTICATION.

FossilOrigin-Name: 7b510f59fd2cf68331c35ef6b4c2bcf092adf1120ea22be74d1bab1f42a171f5

diff --git a/Makefile.in b/Makefile.in
index c7fd1b5404ae9f86b2e2d96e2a73ffd0eca86c31..d2f97100597b523c996f46996df03f6c645361ef 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,6 +32,7 @@ CC = @CC@
 CFLAGS = @CPPFLAGS@ @CFLAGS@
 TCC = ${CC} ${CFLAGS} -I. -I${TOP}/src -I${TOP}/ext/rtree -I${TOP}/ext/icu
 TCC += -I${TOP}/ext/fts3 -I${TOP}/ext/async -I${TOP}/ext/session
+TCC += -I${TOP}/ext/userauth
 
 # Define this for the autoconf-based build, so that the code knows it can
 # include the generated config.h
@@ -187,7 +188,7 @@ LIBOBJS0 = alter.lo analyze.lo attach.lo auth.lo \
          random.lo resolve.lo rowset.lo rtree.lo \
          sqlite3session.lo select.lo sqlite3rbu.lo status.lo stmt.lo \
          table.lo threads.lo tokenize.lo treeview.lo trigger.lo \
-         update.lo upsert.lo util.lo vacuum.lo \
+         update.lo userauth.lo upsert.lo util.lo vacuum.lo \
          vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo vdbesort.lo \
          vdbetrace.lo wal.lo walker.lo where.lo wherecode.lo whereexpr.lo \
          window.lo utf.lo vtab.lo
@@ -355,6 +356,9 @@ SRC += \
 SRC += \
   $(TOP)/ext/session/sqlite3session.c \
   $(TOP)/ext/session/sqlite3session.h
+SRC += \
+  $(TOP)/ext/userauth/userauth.c \
+  $(TOP)/ext/userauth/sqlite3userauth.h
 SRC += \
   $(TOP)/ext/rbu/sqlite3rbu.h \
   $(TOP)/ext/rbu/sqlite3rbu.c
@@ -455,7 +459,8 @@ TESTSRC += \
   $(TOP)/ext/misc/totype.c \
   $(TOP)/ext/misc/unionvtab.c \
   $(TOP)/ext/misc/wholenumber.c \
-  $(TOP)/ext/misc/zipfile.c
+  $(TOP)/ext/misc/zipfile.c \
+  $(TOP)/ext/userauth/userauth.c
 
 # Source code to the library files needed by the test fixture
 #
@@ -561,6 +566,8 @@ EXTHDR += \
   $(TOP)/ext/icu/sqliteicu.h
 EXTHDR += \
   $(TOP)/ext/rtree/sqlite3rtree.h
+EXTHDR += \
+  $(TOP)/ext/userauth/sqlite3userauth.h
 
 # executables needed for testing
 #
@@ -1118,7 +1125,10 @@ fts3_write.lo:   $(TOP)/ext/fts3/fts3_write.c $(HDR) $(EXTHDR)
 rtree.lo:      $(TOP)/ext/rtree/rtree.c $(HDR) $(EXTHDR)
        $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/rtree/rtree.c
 
-sqlite3session.lo:     $(TOP)/ext/session/sqlite3session.c $(HDR) $(EXTHDR)
+sqlite3session.lo:     $(TOP)/ext/userauth/userauth.c $(HDR) $(EXTHDR)
+       $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/userauth/userauth.c
+
+userauth.lo:   $(TOP)/ext/session/sqlite3session.c $(HDR) $(EXTHDR)
        $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/session/sqlite3session.c
 
 json1.lo:      $(TOP)/ext/misc/json1.c

diff --git a/manifest b/manifest
index a19bee40c4ea4d9ef5d54d544a793607f4a0f057..b44d88b4e07ff40c701d1234a18548666fa36ad0 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
-C Remove\s-DSQLITE_USER_AUTHENTICATION\sfrom\sthe\s"Unlock-Notify"\sconfiguration.\nCreate\sa\sdedicated\s"User-Auth"\sconfiguration\sfor\stesting\sthis\sfeature.
-D 2018-11-28T08:09:08.147
+C Changes\sto\sMakefile.in\sto\sallow\stestfixture\sto\sbe\sbuilt\swith\nSQLITE_USER_AUTHENTICATION.
+D 2018-11-28T08:24:41.651
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
-F Makefile.in 15f0851eb3754e37de848d5f8ab24146cf677b44ac38353a2c23e39c999aa422
+F Makefile.in a050c8670ea0d7b37b2192306cbb50d392acd9902b84e9b56f3444d006f97a6c
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 0d6831ff7951b302e888d86d4c469e2ec3c22f59eba4118b8c38d5a51d9e2d4f
 F README.md 377233394b905d3b2e2b33741289e093bc93f2e7adbe00923b2c5958c9a9edee
@@ -1779,7 +1779,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 9bcdec85e21a5228c700f7373b92ae7ea14b585bcda34235b605be4f7ec15a15
-R f0b7e80a5ab891ce6a4c4bf3191e9f8e
+P 8c41024fbba8c70b671c63a5719c6757f0e6dc731ce52caa755edbb8e21d6944
+R fee63f0c7cb397ed3641ccc01d70c69a
 U dan
-Z be108deed9e6953da5ea298ef66f2f22
+Z ca6c4cd6778208e91f050203c0ceb572

diff --git a/manifest.uuid b/manifest.uuid
index 4c9d7b13b60331b2d791b2d69965b8bce9f03958..1733648539332bba27165cb43f14fe70b17e0818 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8c41024fbba8c70b671c63a5719c6757f0e6dc731ce52caa755edbb8e21d6944
\ No newline at end of file
+7b510f59fd2cf68331c35ef6b4c2bcf092adf1120ea22be74d1bab1f42a171f5
\ No newline at end of file