X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=autogen.sh;h=19cca0e338992b6f913a3909f2edb128a007944f;hp=bd15a271ea2d2335ebfae1721f47d9698afc8464;hb=204d54609b4b3e4ca637f0ce2fe98c33ce9d008b;hpb=15821057d4729d8bb369af3a230e717af5563abb;ds=sidebyside

diff --git a/autogen.sh b/autogen.sh
index bd15a27..19cca0e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -24,7 +24,7 @@ set -v
 # Ensure that whenever we pull in a gnulib update or otherwise change to a
 # different version (i.e., when switching branches), we also rerun ./bootstrap.
 curr_status=.git-module-status
-t=$(git submodule status)
+t=$(git submodule status|sed 's/^[ +-]//;s/ .*//')
 if test "$t" = "$(cat $curr_status 2>/dev/null)"; then
     : # good, it's up to date
 else
@@ -46,25 +46,31 @@ 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
-if [ $# == 0 -a -x ./config.status ]; then
+if test $# == 0 && test -x ./config.status; then
     ./config.status --recheck
 else
     $CONFIGUREDIR/configure "$@"