From 3ca69d9db34ebb31eba7b370ffe25a6178c83449 Mon Sep 17 00:00:00 2001 From: Richard Jones Date: Tue, 10 Nov 2009 18:38:54 +0000 Subject: [PATCH] Check for ocaml-xml-light-devel (xml-light.cmxa) Also unquote $pkg since OCaml package names can never contain spaces or other unfriendly characters. --- autogen.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/autogen.sh b/autogen.sh index bd15a27..55842b1 100755 --- a/autogen.sh +++ b/autogen.sh @@ -52,15 +52,16 @@ require_ocaml_pkg() test -d .git || return 1 url=$(git config remote.origin.url) || return 1 case $url in - *git.et.redhat.com/libguestfs.git) ;; + *et.redhat.com/*) ;; *) return 1;; esac - ocamlfind query "$pkg" || return 1 + ocamlfind query $pkg || return 1 + test -f "$(ocamlfind query $pkg)/xml-light.cmxa" || return 1 return 0 } require_ocaml_pkg xml-light \ - || { echo "you must have ocaml, ocamlfind and ocaml-xml-light"; exit 1; } + || { echo "you must have ocaml, ocamlfind, ocaml-xml-light and ocaml-xml-light-devel"; exit 1; } # If no arguments were specified and configure has run before, use the previous # arguments -- 1.8.3.1