F24/F25 follow new stable 1.34 branch.

[goaljobs-goals.git] / config.ml

diff --git a/config.ml b/config.ml
index 87d53bd..d33bb58 100644 (file)
--- a/config.ml
+++ b/config.ml
@@ -29,8 +29,8 @@ let libguestfs_localconfigure source =
 #!/bin/bash -
 . localenv
 
-# NB: --enable-valgrind-daemon is disabled because we
-# should be checking production builds.
+# erlang is disabled because it is broken in Rawhide:
+# https://bugzilla.redhat.com/show_bug.cgi?id=1316206
 
 %s \\
   --prefix /usr \\
@@ -39,12 +39,16 @@ let libguestfs_localconfigure source =
   --enable-werror \\
   --enable-gtk-doc \\
   --disable-golang \\
+  --disable-erlang \\
   -C \\
   \"$@\"
 " configure
 
 let libguestfs_localenv supermin =
   "\
+# Use the real virt-builder configuration from /etc.
+export XDG_CONFIG_DIRS=/etc
+
 # Fails under valgrind because of a leak in the fuse library,
 # although I could not work out exactly why.
 export SKIP_TEST_PARALLEL_MOUNT_LOCAL=1