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

diff --git a/autogen.sh b/autogen.sh
index a1d7e27..ba4612c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -20,12 +20,24 @@
 
 set -e
 set -v
-export AUTOMAKE='automake --foreign'
+
 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