X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=autogen.sh;h=0c74faebcadbde1603db9e18bda92995d619b722;hp=b31ec7bfef954aa841bb37f213a08938cdd19703;hb=692f127447d399db21c2e93026d4d2b0ac1839d1;hpb=825d855b225c7c76371c72eae4d505a32c374007

diff --git a/autogen.sh b/autogen.sh
index b31ec7b..0c74fae 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
@@ -42,35 +42,9 @@ 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 [ $# == 0 -a -x ./config.status ]; then
+if test $# == 0 && test -x ./config.status; then
     ./config.status --recheck
 else
     $CONFIGUREDIR/configure "$@"