X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=autogen.sh;h=0c74faebcadbde1603db9e18bda92995d619b722;hp=51796237ffe8026bbddeb75c35d213a655523c86;hb=e44cf42f362d793c47d892a18a6853d88abd6ecb;hpb=480a489ee4c31cb2f9c9f45941645f05b5f74c67

diff --git a/autogen.sh b/autogen.sh
index 5179623..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
@@ -32,9 +32,6 @@ else
     ./bootstrap && echo "$t" > $curr_status
 fi
 
-mkdir -p daemon/m4
-autoreconf -i
-
 CONFIGUREDIR=.
 
 # Run configure in BUILDDIR if it's set
@@ -47,7 +44,7 @@ fi
 
 # 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 "$@"