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

diff --git a/autogen.sh b/autogen.sh
index fa2af25..ba4612c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -20,11 +20,24 @@
 
 set -e
 set -v
-export AUTOMAKE='automake --foreign'
-aclocal
-libtoolize
-autoreconf
-pushd daemon
-autoreconf
-popd
-./configure "$@"
+
+mkdir -p daemon/m4
+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