Allow building tup after removing some bundled sources from the source
tree.

diff --git a/build.sh b/build.sh
index 2937116d..eab650f7 100755
--- a/build.sh
+++ b/build.sh
@@ -16,7 +16,7 @@ else
 	echo "Error: invalid TUP_SERVER \"$server\"" 1>&2
 	exit 1
 fi
-LDFLAGS="$LDFLAGS -lm"
+LDFLAGS="$LDFLAGS -lm -lsqlite3 `pcre-config --libs`"
 : ${CC:=gcc}
 case "$os" in
 	Linux)
@@ -65,17 +65,15 @@ mkdir luabuiltin
 
 CFLAGS="$CFLAGS -DTUP_SERVER=\"$server\""
 CFLAGS="$CFLAGS -DHAVE_CONFIG_H"
+CFLAGS="$CFLAGS `pcre-config --cflags`"
 
-for i in ../src/tup/*.c ../src/tup/tup/main.c ../src/tup/monitor/null.c ../src/tup/flock/fcntl.c ../src/inih/ini.c ../src/pcre/*.c $plat_files; do
+for i in ../src/tup/*.c ../src/tup/tup/main.c ../src/tup/monitor/null.c ../src/tup/flock/fcntl.c ../src/inih/ini.c $plat_files; do
 	echo "  bootstrap CC $CFLAGS $i"
 	# Put -I. first so we find our new luabuiltin.h file, not one built
 	# by a previous 'tup upd'.
-	$CC $CFLAGS -c $i -I. -I../src -I../src/pcre $plat_cflags
+	$CC $CFLAGS -c $i -I. -I../src $plat_cflags
 done
 
-echo "  bootstrap CC $CFLAGS ../src/sqlite3/sqlite3.c"
-$CC $CFLAGS -c ../src/sqlite3/sqlite3.c -DSQLITE_TEMP_STORE=2 -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION $plat_cflags
-
 echo "  bootstrap LD tup $LDFLAGS"
 echo "const char *tup_version(void) {return \"$label\";}" | $CC -x c -c - -o tup_version.o
 $CC *.o -o tup -lpthread $plat_ldflags $LDFLAGS
diff --git a/src/tup/db.c b/src/tup/db.c
index 55ee3edd..9bdf7a80 100644
--- a/src/tup/db.c
+++ b/src/tup/db.c
@@ -46,7 +46,7 @@
 #include <errno.h>
 #include <ctype.h>
 #include <sys/stat.h>
-#include "sqlite3/sqlite3.h"
+#include <sqlite3.h>
 
 #define DB_VERSION 17
 #define PARSER_VERSION 12
diff --git a/src/tup/tupid.h b/src/tup/tupid.h
index 7b36ae46..19aed438 100644
--- a/src/tup/tupid.h
+++ b/src/tup/tupid.h
@@ -21,7 +21,7 @@
 #ifndef tup_tupid_h
 #define tup_tupid_h
 
-#include "sqlite3/sqlite3.h"
+#include <sqlite3.h>
 
 typedef sqlite3_int64 tupid_t;
 
-- 
2.26.2

h'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=5488c0ac0659f65ea43cabfafa0c97cdd44fd811'>root</a>/<a href='/guix/log/gnu?id=5488c0ac0659f65ea43cabfafa0c97cdd44fd811'>gnu</a>/<a href='/guix/log/gnu/packages?id=5488c0ac0659f65ea43cabfafa0c97cdd44fd811'>packages</a>/<a href='/guix/log/gnu/packages/pkg-config.scm?id=5488c0ac0659f65ea43cabfafa0c97cdd44fd811'>pkg-config.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/pkg-config.scm?id=5488c0ac0659f65ea43cabfafa0c97cdd44fd811&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-08-26 11:30:27 +0800'>2023-08-26</span></td><td><a href='/guix/commit/gnu/packages/pkg-config.scm?id=eeb71d778f149834015858467fbeeb1276d96d1d'>gnu: pkgconf: Update to 2.0.2.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/pkg-config.scm (pkgconf): Update to 2.0.2.

Signed-off-by: 宋文武 &lt;iyzsong@member.fsf.org&gt;
</span></span></td><td>Zheng Junjie</td></tr>
<tr><td><span title='2023-03-06 21:27:06 -0500'>2023-03-06</span></td><td><a href='/guix/commit/gnu/packages/pkg-config.scm?id=ff5f34ae757d709987896d6164bf125319a0f764'>gnu: perl-extutils-pkgconfig: Support cross-compilation.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/search-paths.scm ($PKG_CONFIG_PATH): New variable.
* gnu/packages/pkg-config.scm (%pkg-config): Use it.
* gnu/packages/perl.scm (perl-extutils-pkgconfig-for-target): New procedure.
(perl-extutils-pkgconfig): Turn into a syntax that
conditionally expands to...
(cross-perl-extutils-pkgconfig): ... this when %current-target-system is set,
or...
(%perl-extutils-pkgconfig): ... this in a native compilation context.
[arguments]: New field.
[propagated-inputs]: Turn into...
[native-inputs]: ... this.
[native-search-paths]: New field.
</span></span></td><td>Maxim Cournoyer</td></tr>