X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=autogen.sh;h=51796237ffe8026bbddeb75c35d213a655523c86;hp=a1d7e271ca02243fdba77fdbdac50b196e55d45f;hb=e15ff2113f5b2a7e0aa138c47c14e93268d25aed;hpb=bccbfe5ab55c8aa5bbb0fb6e209936ff1359605a

diff --git a/autogen.sh b/autogen.sh
index a1d7e27..5179623 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -20,12 +20,35 @@
 
 set -e
 set -v
-export AUTOMAKE='automake --foreign'
+
+# 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)
+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
+
 mkdir -p daemon/m4
-aclocal
-libtoolize
 autoreconf -i
-pushd daemon
-autoreconf -i
-popd
-./configure "$@"
+
+CONFIGUREDIR=.
+
+# Run configure in BUILDDIR if it's set
+if [ ! -z "$BUILDDIR" ]; then
+    mkdir -p $BUILDDIR
+    cd $BUILDDIR
+
+    CONFIGUREDIR=..
+fi
+
+# If no arguments were specified and configure has run before, use the previous
+# arguments
+if [ $# == 0 -a -x ./config.status ]; then
+    ./config.status --recheck
+else
+    $CONFIGUREDIR/configure "$@"
+fi