X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=autogen.sh;h=bd15a271ea2d2335ebfae1721f47d9698afc8464;hb=aa4fffd512faf302bacfef70c4f1f81f64820a66;hp=51796237ffe8026bbddeb75c35d213a655523c86;hpb=480a489ee4c31cb2f9c9f45941645f05b5f74c67;p=libguestfs.git

diff --git a/autogen.sh b/autogen.sh
index 5179623..bd15a27 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -32,9 +32,6 @@ else
     ./bootstrap && echo "$t" > $curr_status
 fi
 
-mkdir -p daemon/m4
-autoreconf -i
-
 CONFIGUREDIR=.
 
 # Run configure in BUILDDIR if it's set
@@ -45,6 +42,26 @@ if [ ! -z "$BUILDDIR" ]; then
     CONFIGUREDIR=..
 fi
 
+# Ensure that an ocaml package is present for build-from sources.
+# This is *not* for anything that is required at configure-time
+# when configure is run from a distribution tarball.  From those,
+# nothing ocaml-related is required.
+require_ocaml_pkg()
+{
+  pkg=$1
+  test -d .git || return 1
+  url=$(git config remote.origin.url) || return 1
+  case $url in
+    *git.et.redhat.com/libguestfs.git) ;;
+    *) return 1;;
+  esac
+  ocamlfind query "$pkg" || return 1
+  return 0
+}
+
+require_ocaml_pkg xml-light \
+  || { echo "you must have ocaml, ocamlfind and ocaml-xml-light"; exit 1; }
+
 # If no arguments were specified and configure has run before, use the previous
 # arguments
 if [ $# == 0 -a -x ./config.status ]; then