Fix the THREADSAFE macro in Makefile.in. We really need to rework the

whole autoconf build system.... (CVS 2520)

FossilOrigin-Name: 98a4de76e0593ef1d1d3e8b785d420cd554a08e8

diff --git a/Makefile.in b/Makefile.in
index f19816279d8e3725735d5f2ce7ab89b357ef8e8a..4d0bf4e6e639c64dd8ac8258f7d321035365ad65 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -52,7 +52,7 @@ LIBREADLINE = @TARGET_READLINE_LIBS@
 
 # Should the database engine be compiled threadsafe
 #
-THREADSAFE = -DTHREADSAFE=@THREADSAFE@
+OPTS += -DTHREADSAFE=@THREADSAFE@
 
 # The pthreads library if needed
 #
@@ -317,10 +317,10 @@ opcodes.h:        parse.h $(TOP)/src/vdbe.c $(TOP)/mkopcodeh.awk
        cat parse.h $(TOP)/src/vdbe.c | awk -f $(TOP)/mkopcodeh.awk >opcodes.h
 
 os_unix.lo:    $(TOP)/src/os_unix.c $(HDR)
-       $(LTCOMPILE) $(THREADSAFE) -c $(TOP)/src/os_unix.c
+       $(LTCOMPILE) -c $(TOP)/src/os_unix.c
 
 os_win.lo:     $(TOP)/src/os_win.c $(HDR)
-       $(LTCOMPILE) $(THREADSAFE) -c $(TOP)/src/os_win.c
+       $(LTCOMPILE) -c $(TOP)/src/os_win.c
 
 parse.lo:      parse.c $(HDR)
        $(LTCOMPILE) -c parse.c
@@ -404,8 +404,7 @@ tclsqlite3: tclsqlite-shell.lo libsqlite3.la
                 libsqlite3.la $(LIBTCL)
 
 testfixture$(TEXE):    $(TOP)/src/tclsqlite.c libtclsqlite3.la libsqlite3.la $(TESTSRC)
-       $(LTLINK) -DTCLSH=1 -DSQLITE_TEST=1\
-                $(THREADSAFE) $(TEMP_STORE)\
+       $(LTLINK) -DTCLSH=1 -DSQLITE_TEST=1 $(TEMP_STORE)\
                 -o testfixture $(TESTSRC) $(TOP)/src/tclsqlite.c \
                libtclsqlite3.la $(LIBTCL)
 
@@ -432,8 +431,7 @@ sqlite3_analyzer$(TEXE):    $(TOP)/src/tclsqlite.c libtclsqlite3.la \
          -e 's,^,",' \
          -e 's,$$,\\n",' \
          $(TOP)/tool/spaceanal.tcl >spaceanal_tcl.h
-       $(LTLINK) -DTCLSH=2 -DSQLITE_TEST=1\
-                $(THREADSAFE) $(TEMP_STORE)\
+       $(LTLINK) -DTCLSH=2 -DSQLITE_TEST=1 $(TEMP_STORE)\
                 -o sqlite3_analyzer$(EXE) $(TESTSRC) $(TOP)/src/tclsqlite.c \
                libtclsqlite3.la $(LIBTCL)
 

diff --git a/manifest b/manifest
index 27a01fe38d599316a31f75ead9ae1faba947f68c..f714e04349a27e94fcca230db880fbfe2d38eeed 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
-C Change\sto\sMakefile.in\sto\sfix\sa\sproblem\swith\sthe\sBorland\slinker.\nTicket\s#1291.\s(CVS\s2519)
-D 2005-06-16T16:51:15
-F Makefile.in fade38fa2278b15b497ee3c359f7ed81276ff372
+C Fix\sthe\sTHREADSAFE\smacro\sin\sMakefile.in.\s\sWe\sreally\sneed\sto\srework\sthe\nwhole\sautoconf\sbuild\ssystem....\s(CVS\s2520)
+D 2005-06-16T18:47:39
+F Makefile.in 64a6635ef44a98325e0cffe8d67669920a3dad47
 F Makefile.linux-gcc 06be33b2a9ad4f005a5f42b22c4a19dab3cbb5c7
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
 F VERSION 44fad0bf0996660a11bf8187361de03941d9b7b0
@@ -281,7 +281,7 @@ F www/tclsqlite.tcl 425be741b8ae664f55cb1ef2371aab0a75109cf9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 528299b8316726dbcc5548e9aa0648c8b1bd055b
-P 4713b1e1040f2e0645fa593638e392df44b5bfc1
-R 61cc360cf477b658836de7733310c636
+P bc25397735c1485e3533507bed507250ea07534a
+R 4ca41c6cea7e59473590468b9797e8d7
 U drh
-Z ee38707e8741102b56d07955b262630f
+Z 1e3fd8e4bb12da8eb2b82638f8e04384

diff --git a/manifest.uuid b/manifest.uuid
index 702d5671c846a548b15f31d46e793f3092a7653a..65730790ab307a66735a1d225f5fc5ee79d47b9e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bc25397735c1485e3533507bed507250ea07534a
\ No newline at end of file
+98a4de76e0593ef1d1d3e8b785d420cd554a08e8
\ No newline at end of file