X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=autogen.sh;h=19cca0e338992b6f913a3909f2edb128a007944f;hp=b31ec7bfef954aa841bb37f213a08938cdd19703;hb=204d54609b4b3e4ca637f0ce2fe98c33ce9d008b;hpb=825d855b225c7c76371c72eae4d505a32c374007

diff --git a/autogen.sh b/autogen.sh
index b31ec7b..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
@@ -70,7 +70,7 @@ require_ocaml_pkg()
 
 # 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 "$@"