From: drh <drh@noemail.net>
Date: Wed, 24 Aug 2005 18:04:51 +0000 (+0000)
Subject: Fix the --enable-threadsafe option to the configure script.  Ticket #1378. (CVS 2623)
X-Git-Tag: version-3.6.10~3536
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=65d415cb72be8d8b3a67f2635dddbc0e5652fcce;p=thirdparty%2Fsqlite.git

Fix the --enable-threadsafe option to the configure script.  Ticket #1378. (CVS 2623)

FossilOrigin-Name: 76ec0b3d3a6cc82965e4f993375780b954c53dd1
---

diff --git a/Makefile.in b/Makefile.in
index af3e5d7689..586c6b94a2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -52,7 +52,7 @@ LIBREADLINE = @TARGET_READLINE_LIBS@
 
 # Should the database engine be compiled threadsafe
 #
-OPTS += -DTHREADSAFE=@THREADSAFE@
+TCC += -DTHREADSAFE=@THREADSAFE@
 
 # The pthreads library if needed
 #
@@ -423,14 +423,14 @@ tclsqlite3:	tclsqlite-shell.lo libsqlite3.la
 		 libsqlite3.la $(LIBTCL)
 
 testfixture$(TEXE):	$(TOP)/src/tclsqlite.c $(TESTSRC) $(COMMONOBJ)
-	$(LTLINK) -DTCLSH=1 -DSQLITE_TEST=1 $(THREADSAFE) $(TEMP_STORE)\
+	$(LTLINK) -DTCLSH=1 -DSQLITE_TEST=1 $(TEMP_STORE) \
 	-o testfixture \
-	$(TESTSRC) $(TOP)/src/tclsqlite.c $(COMMONOBJ) $(LIBTCL)
+	$(TESTSRC) $(TOP)/src/tclsqlite.c $(COMMONOBJ) $(LIBTCL) $(LIBPTHREAD)
 
 crashtest$(TEXE): $(TOP)/src/tclsqlite.c $(TOP)/src/os_test.c $(TESTSRC) $(COMMONOBJ)
 	$(LTLINK) -DOS_TEST=1 -DTCLSH=1 -DSQLITE_TEST=1 \
 	-o crashtest $(TOP)/src/os_test.c \
-	$(TESTSRC) $(TOP)/src/tclsqlite.c $(COMMONOBJ) $(LIBTCL)
+	$(TESTSRC) $(TOP)/src/tclsqlite.c $(COMMONOBJ) $(LIBTCL) $(LIBPTHREAD)
 
 
 
diff --git a/manifest b/manifest
index 3a9f18d031..1315f75038 100644
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
-C Additional\sdefense\sagainst\sthe\srowid-fifo\soverflow\sproblem.\s(CVS\s2622)
-D 2005-08-24T17:07:38
-F Makefile.in b109ddb46a5550d0732dcd6caca01c123f6d5cdd
+C Fix\sthe\s--enable-threadsafe\soption\sto\sthe\sconfigure\sscript.\s\sTicket\s#1378.\s(CVS\s2623)
+D 2005-08-24T18:04:52
+F Makefile.in 87717916c787099d5a9a64f7a2acc188b4bbcadd
 F Makefile.linux-gcc 06be33b2a9ad4f005a5f42b22c4a19dab3cbb5c7
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
 F VERSION ecc511d6f3cf01f5fdcb1707f9aee0cbb41ea35d
@@ -298,7 +298,7 @@ F www/tclsqlite.tcl 3df553505b6efcad08f91e9b975deb2e6c9bb955
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P aa7dd3f2c72335fe7778c021e4b6bbbc4ec322df
-R 88028b7e2a4409662feaad4ce9d2d230
+P 881dcf5fb16997830ff347d2eb2610784b415f25
+R 939024975362728b01087b80f2fa0a24
 U drh
-Z bcc37c9c982f637d004abc9c28de8320
+Z 0f48b7d406ced2895a04bb83a892dae0
diff --git a/manifest.uuid b/manifest.uuid
index 45616979e6..bc5de6e48d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-881dcf5fb16997830ff347d2eb2610784b415f25
\ No newline at end of file
+76ec0b3d3a6cc82965e4f993375780b954c53dd1
\ No newline at end of file