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

diff --git a/autogen.sh b/autogen.sh
index ba4612c..0c74fae 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -21,8 +21,16 @@
 set -e
 set -v
 
-mkdir -p daemon/m4
-autoreconf -i
+# 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/ .*//')
+if test "$t" = "$(cat $curr_status 2>/dev/null)"; then
+    : # good, it's up to date
+else
+    echo running bootstrap...
+    ./bootstrap && echo "$t" > $curr_status
+fi
 
 CONFIGUREDIR=.
 
@@ -36,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 "$@"