X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=autogen.sh;h=649ca7be3e8fadf1ea10a34a9985a980677182c5;hp=fa2af259070bd6df73450461baf8bb6f53ca2e6d;hb=f482e7ea665938152518fe15cd71cfe882dd2b30;hpb=91df7a164befc0c9a24f85733837874da5a057ac

diff --git a/autogen.sh b/autogen.sh
index fa2af25..649ca7b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -20,11 +20,39 @@
 
 set -e
 set -v
-export AUTOMAKE='automake --foreign'
-aclocal
-libtoolize
-autoreconf
-pushd daemon
-autoreconf
-popd
-./configure "$@"
+
+# 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
+
+# Remove this file, so autoreconf doesn't complain about it being
+# locally modified.
+rm -f build-aux/config.rpath
+autoreconf -i
+
+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