diff --git a/Makefile.in b/Makefile.in index d017d642a8..39d93af508 100644 --- a/Makefile.in +++ b/Makefile.in @@ -73,6 +73,10 @@ TEMP_STORE = -DTEMP_STORE=@TEMP_STORE@ # You should not have to change anything below this line ############################################################################### +# The pthreads library is always defined, even if we don't need it. +# +LIBPTHREAD=-lpthread + # Object files for the SQLite library. # LIBOBJ = attach.lo auth.lo btree.lo build.lo date.lo delete.lo \ @@ -189,17 +193,17 @@ last_change: $(SRC) | awk '{print $$5,$$6}' >last_change libsqlite3.la: $(LIBOBJ) - $(LTLINK) -o libsqlite3.la $(LIBOBJ) ${RELEASE} -rpath $(libdir) \ - -version-info "8:6:8" + $(LTLINK) -o libsqlite3.la $(LIBOBJ) $(LIBPTHREAD) \ + ${RELEASE} -rpath $(libdir) -version-info "8:6:8" libtclsqlite3.la: tclsqlite.lo libsqlite3.la $(LTLINK) -o libtclsqlite3.la tclsqlite.lo \ - libsqlite3.la $(LIBTCL) -rpath $(libdir)/sqlite \ + libsqlite3.la $(LIBTCL) $(LIBPTHREAD) -rpath $(libdir)/sqlite \ -version-info "8:6:8" sqlite3@TARGET_EXEEXT@: $(TOP)/src/shell.c libsqlite3.la sqlite3.h - $(LTLINK) $(READLINE_FLAGS) -o sqlite3 $(TOP)/src/shell.c \ - libsqlite3.la $(LIBREADLINE) + $(LTLINK) $(READLINE_FLAGS) $(LIBPTHREAD) \ + -o sqlite3 $(TOP)/src/shell.c libsqlite3.la $(LIBREADLINE) # This target creates a directory named "tsrc" and fills it with # copies of all of the C source code and header files needed to diff --git a/manifest b/manifest index a9309b2851..7adf0d536d 100644 --- a/manifest +++ b/manifest @@ -1,6 +1,6 @@ -C Make\suse\sof\s$(libdir)\sin\sthe\sMakefile.in.\s\sTicket\s#904.\s(CVS\s1967) -D 2004-09-17T21:07:35 -F Makefile.in 7caec4bd363c293f4c788702bab9e4594a6dff50 +C Always\sinclude\s-lpthread\son\slink\slines\seven\sif\sit\sis\snot\sneeded.\s(CVS\s1968) +D 2004-09-17T21:35:31 +F Makefile.in 76f8790c727cdbe2e1bef19c9c72b6e5da9cb9d8 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd F VERSION d28cfc2e7714a747851e50cc1a5ee8ab0ded7a78 @@ -247,7 +247,7 @@ F www/tclsqlite.tcl 560ecd6a916b320e59f2917317398f3d59b7cc25 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4 -P 02de1cf95e0cf230aeebdb0c4684e486b1424810 -R 5fd45ed04f8acd8e14a46cd20cdb76cc +P 10b5e5173339cc7f052aace1b4056a057afe3e66 +R 8816ed45991f1ef6103b7b8a111b1d35 U drh -Z 81a3747d954a649eef9094d502c1fbe6 +Z b109fb1b1eb544c33f3008b88b47c374 diff --git a/manifest.uuid b/manifest.uuid index b06d66814c..157772e853 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -10b5e5173339cc7f052aace1b4056a057afe3e66 \ No newline at end of file +46a96890f7008157bc3784fa7c8680edf6266673 \ No newline at end of file