X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=config.ml;h=11734d3858181a211867c2cd9a400f29b13e4779;hb=4b474a524994c85339b5f50b5d8df734a8efae96;hp=5390121025b3378f3937e87e9e0175071528d2b8;hpb=28b972dc12b33c81a99facfb8c30b4de493093ad;p=goaljobs-goals.git

diff --git a/config.ml b/config.ml
index 5390121..11734d3 100644
--- a/config.ml
+++ b/config.ml
@@ -11,8 +11,8 @@ let buildtmp = sprintf "%s/tmp/builds" (Sys.getenv "HOME")
 (* libguestfs *)
 let libguestfs_query_mins = 60
 
-let libguestfs_website_cvs =
-  sprintf "%s/d/redhat/websites/libguestfs" (Sys.getenv "HOME")
+let libguestfs_website_repo =
+  sprintf "%s/d/websites/libguestfs" (Sys.getenv "HOME")
 
 let libguestfs_localconfigure source =
   let configure =
@@ -23,21 +23,35 @@ let libguestfs_localconfigure source =
 #!/bin/bash -
 . localenv
 
+# NB: --enable-valgrind-daemon is disabled because we
+# should be checking production builds.
+
 %s \\
   --prefix /usr \\
   --disable-static \\
   --with-default-backend=libvirt \\
-  --enable-gcc-warnings \\
+  --enable-werror \\
   --enable-gtk-doc \\
-  --enable-valgrind-daemon \\
+  --disable-golang \\
   -C \\
   \"$@\"
 " configure
 
-let libguestfs_localenv = "\
+let libguestfs_localenv supermin =
+  "\
 # Parallel test runs out of resources starting qemu, unclear why.
 export SKIP_TEST_PARALLEL_MOUNT_LOCAL=1
 
 # Fails under valgrind because cpio subprocess has a memory leak.
 export SKIP_TEST_FILE_ARCHITECTURE_11=1
-"
+
+" ^
+    match supermin with
+    | None -> ""
+    | Some (supermin, supermin_helper) ->
+      sprintf "\
+# Needs a modified path to supermin binaries:
+export SUPERMIN=%s
+export SUPERMIN_HELPER=%s
+
+" supermin supermin_helper