X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=autogen.sh;h=80b67c3872c310e98a3e87eee92f3d8736010f5d;hp=cbb6da895444ec45f917475408fc1bf8c7ffda93;hb=bf0280bf589573c11529999a73e9ec642dea9d61;hpb=1b4bab6db252abcc3daab11159b0e45862c10b4c

diff --git a/autogen.sh b/autogen.sh
index cbb6da8..80b67c3 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -21,10 +21,14 @@
 set -e
 set -v
 
+# ocaml/.depend is updated automatically. However, as it's included by
+# ocaml/Makefile.am we need to bootstrap it here.
+touch ocaml/.depend
+
 # 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|sed 's/.//;s/ .*//')
+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 +74,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 "$@"