From: Richard Jones <rjones@redhat.com>
Date: Wed, 11 Nov 2009 13:40:04 +0000 (+0000)
Subject: autogen.sh: Remove test for ocaml etc from this script.
X-Git-Tag: 1.0.79~23
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=62288e7118733ee433313267d44133ab5ce4b647;p=libguestfs.git

autogen.sh: Remove test for ocaml etc from this script.

This test seems to cause a lot of trouble.  We need to go back to
the drawing-board on this one.
---

diff --git a/autogen.sh b/autogen.sh
index 55842b1..9c73a2d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -42,27 +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.
-require_ocaml_pkg()
-{
-  pkg=$1
-  test -d .git || return 1
-  url=$(git config remote.origin.url) || return 1
-  case $url in
-    *et.redhat.com/*) ;;
-    *) return 1;;
-  esac
-  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, ocaml-xml-light and ocaml-xml-light-devel"; exit 1; }
-
 # If no arguments were specified and configure has run before, use the previous
 # arguments
 if [ $# == 0 -a -x ./config.status ]; then