X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=autogen.sh;h=b31ec7bfef954aa841bb37f213a08938cdd19703;hb=16c1b3164698900f52294e1396542ddd94a4cae4;hp=bd15a271ea2d2335ebfae1721f47d9698afc8464;hpb=15821057d4729d8bb369af3a230e717af5563abb;p=libguestfs.git

diff --git a/autogen.sh b/autogen.sh
index bd15a27..b31ec7b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -46,21 +46,27 @@ fi
 # 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
-  test -d .git || return 1
-  url=$(git config remote.origin.url) || return 1
-  case $url in
-    *git.et.redhat.com/libguestfs.git) ;;
-    *) return 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
-  ocamlfind query "$pkg" || return 1
   return 0
 }
 
-require_ocaml_pkg xml-light \
-  || { echo "you must have ocaml, ocamlfind and ocaml-xml-light"; exit 1; }
+{ 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