inspect: Abstract the wrapper that sets up Augeas.

[libguestfs.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index bd15a27..0c74fae 100755 (executable)
--- 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,29 +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.
-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;;
-  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; }
-
 # 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 "$@"