X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=autogen.sh;h=0c74faebcadbde1603db9e18bda92995d619b722;hp=19cca0e338992b6f913a3909f2edb128a007944f;hb=692f127447d399db21c2e93026d4d2b0ac1839d1;hpb=ed2bd31f9128036cd59399e1d8234023806082a7 diff --git a/autogen.sh b/autogen.sh index 19cca0e..0c74fae 100755 --- a/autogen.sh +++ b/autogen.sh @@ -42,32 +42,6 @@ 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. -# ocamlfind cannot detect the presence of -devel packages directly, -# so if $pkg ends in -devel, first check for the base package, and -# if that's found, check for the existence of $base.cmxa in the -# resulting directory. -require_ocaml_pkg() -{ - pkg=$1 - case $pkg in - *-devel) - local base=${pkg%%-devel} - local dir=$(ocamlfind query "$base") || return 1 - test -f "$dir/$base.cmxa" || return 1 - ;; - *) ocamlfind query "$pkg" > /dev/null 2>&1 || return 1;; - esac - return 0 -} - -{ require_ocaml_pkg xml-light && require_ocaml_pkg xml-light-devel; } \ - || { echo "you must have ocaml, ocamlfind, ocaml-xml-light" \ - "and ocaml-xml-light-devel" >&2; exit 1; } - # If no arguments were specified and configure has run before, use the previous # arguments if test $# == 0 && test -x ./config.status; then