# 
# patch "Makefile"
#  from [da3f8cbf162e3463821edb181dc8f8198ca7f631]
#    to [dbce3abd1fc0773566cbef48b2c50916080c02b3]
# 
# patch "config.make.in"
#  from [f5c8ece6dbb2201a5a0d666c353b4b0346aa8f3a]
#    to [2ce163755bfad2267000b306499b53e0ff5140a9]
# 
# patch "configure.ac"
#  from [770dee80aed104ca0636dc6a8d5fbef24f2fdc02]
#    to [c9959c1310ab37ecba84edab107f49b9d742711c]
# 
--- Makefile
+++ Makefile
@@ -52,24 +52,34 @@
           glib/gspawn_tags.var glib/giochannel_tags.var \
           crypto/ocaml-openssl.c crypto/crypto.ml crypto/crypto.mli
 
+ifdef SQLITE_LIBS
+LIB3RDPARTY_OBJ = $(C_OBJ)
+SQLITE_LINK     = -ccopt "$(SQLITE_LIBS)"
+else
+LIB3RDPARTY_OBJ = $(MONOTONE_DIR)/sqlite/lib3rdparty_a-*.o $(C_OBJ)
+endif
 
 ifeq ($(OCAMLBEST), opt)
 monotone-viz : $(OBJX) lib3rdparty.a
-	$(OCAMLOPT) -o $@ -I . -I $(LABLGTK_DIR) $(MLLIBS) $^ $(CRYPTO_LIB) 
+	$(OCAMLOPT) -o $@ -I . -I $(LABLGTK_DIR) $(MLLIBS) $^ $(CRYPTO_LIB) $(SQLITE_LINK)
 monotone-viz : MLLIBS = str.cmxa lablgtk.cmxa gtkInit.cmx lablgnomecanvas.cmxa 
 else
 monotone-viz : $(OBJ) lib3rdparty.a
-	$(OCAMLC) -custom -o $@ -I . -I $(LABLGTK_DIR) $(MLLIBS) $^ $(CRYPTO_LIB) 
+	$(OCAMLC) -custom -o $@ -I . -I $(LABLGTK_DIR) $(MLLIBS) $^ $(CRYPTO_LIB) $(SQLITE_LINK)
 monotone-viz : MLLIBS = str.cma lablgtk.cma gtkInit.cmo lablgnomecanvas.cma 
 endif
 
 lib3rdparty.a : $(C_OBJ)
-	ar crs lib3rdparty.a $(MONOTONE_DIR)/sqlite/lib3rdparty_a-*.o $^
+	ar crs lib3rdparty.a $(LIB3RDPARTY_OBJ)
 
 glib/ocaml-gspawn.o : gspawn_tags.c gspawn_tags.h
 glib/ocaml-giochannel.o : giochannel_tags.c giochannel_tags.h
 glib/ocaml-%.o           : CINCDIRS = -I $(LABLGTK_DIR) -ccopt "$(GTK_CFLAGS)"
+ifdef SQLITE_LIBS
+mlsqlite/ocaml-sqlite3.o : CINCDIRS = -ccopt "$(SQLITE_CFLAGS)"
+else
 mlsqlite/ocaml-sqlite3.o : CINCDIRS = -I $(MONOTONE_DIR)/sqlite
+endif
 crypto/ocaml-openssl.o   : CINCDIRS = -ccopt "$(CRYPTO_CFLAGS)"
 gnomecanvas_hack.o       : CINCDIRS = -ccopt "$(GNOMECANVAS_CFLAGS)"
 
@@ -91,7 +101,7 @@
 	$(OCAMLC) $(MLINCDIRS) $<
 
 %.o : %.c
-	cd $(<D) ; $(OCAMLC) $(CINCDIRS) $(<F)
+	cd $(<D) ; $(OCAMLC) $(CINCDIRS) $(if $(CPPFLAGS),-ccopt "$(CPPFLAGS)") $(<F)
 
 %.c %.h : %.var
 	cd $(<D) ; $(LABLGTK_DIR)/varcc -static $(<F)
--- config.make.in
+++ config.make.in
@@ -11,6 +11,9 @@
 MONOTONE_DIR := @MONOTONE_DIR@
 LABLGTK_DIR  := @LABLGTK_DIR@
 CRYPTO_LIB   := /usr/lib/libcrypto.a
+SQLITE_CFLAGS := @SQLITE_CFLAGS@
+SQLITE_LIBS   := @SQLITE_LIBS@
+CPPFLAGS      := @CPPFLAGS@
 
 NAME    := @PACKAGE_NAME@
 VERSION := @PACKAGE_VERSION@
--- configure.ac
+++ configure.ac
@@ -49,8 +49,16 @@
 			   [specify location of monotone build tree]),
 	    MONOTONE_DIR=$withval,
 	    MONOTONE_DIR=monotone)
-AC_MSG_CHECKING(sqlite sources)
-if test -d "$MONOTONE_DIR" -a -r "$MONOTONE_DIR/sqlite/lib3rdparty_a-main.o" ; then
+AC_ARG_WITH([shared-sqlite],
+            AS_HELP_STRING([--with-shared-sqlite],
+	                   [use a system-wide shared sqlite library]),
+            SHARED_SQLITE=$withval,
+            SHARED_SQLITE=no)
+AC_MSG_CHECKING(sqlite)
+if test "$SHARED_SQLITE" = "yes" ; then
+  PKG_CHECK_MODULES(SQLITE, sqlite >= 3.0,,AC_MSG_ERROR([
+Couldn't use the shared sqlite package.]))
+elif test -d "$MONOTONE_DIR" -a -r "$MONOTONE_DIR/sqlite/lib3rdparty_a-main.o" ; then
   AC_MSG_RESULT(found in $MONOTONE_DIR/sqlite)
 else
   AC_MSG_ERROR([
@@ -65,4 +73,8 @@
 fi
 AC_SUBST(MONOTONE_DIR)
 
+# Keep CPPFLAGS around, can be useful if caml headers are in a 
+# non-standard location.
+AC_SUBST(CPPFLAGS)
+
 AC_OUTPUT(config.make)