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 ../s</td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=cfbddc3d54852d218a9e00a605e8e67bd992b94b'>refs</a><a href='/guix/log/etc/gnu-store.mount.in'>log</a><a href='/guix/tree/etc/gnu-store.mount.in?id=cfbddc3d54852d218a9e00a605e8e67bd992b94b'>tree</a><a href='/guix/commit/etc/gnu-store.mount.in?id=cfbddc3d54852d218a9e00a605e8e67bd992b94b'>commit</a><a class='active' href='/guix/diff/etc/gnu-store.mount.in?id=cfbddc3d54852d218a9e00a605e8e67bd992b94b&amp;id2=9800aaca91d5dab8cefbf2f9f1d119a8fed653e4'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/etc/gnu-store.mount.in'>
<input type='hidden' name='id' value='cfbddc3d54852d218a9e00a605e8e67bd992b94b'/><input type='hidden' name='id2' value='9800aaca91d5dab8cefbf2f9f1d119a8fed653e4'/><select name='qt'>
<option value='grep'>log msg</option>
<op