From: Jim Meyering Date: Tue, 10 Nov 2009 13:31:42 +0000 (+0100) Subject: build: die early if we lack ocaml, ocamlfind or ocaml-xml-light X-Git-Tag: 1.0.78~15 X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=15821057d4729d8bb369af3a230e717af5563abb;p=libguestfs.git build: die early if we lack ocaml, ocamlfind or ocaml-xml-light * autogen.sh: Ensure that we fail very early when not building from a tarball and when one of those is not installed. --- diff --git a/autogen.sh b/autogen.sh index 9c73a2d..bd15a27 100755 --- a/autogen.sh +++ b/autogen.sh @@ -42,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