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

diff --git a/autogen.sh b/autogen.sh
index 959fdce..ba4612c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -
+#!/bin/bash -
 # libguestfs
 # Copyright (C) 2009 Red Hat Inc.
 #
@@ -20,7 +20,24 @@
 
 set -e
 set -v
-export AUTOMAKE='automake --foreign'
-autoreconf
-cd daemon
-autoreconf
\ No newline at end of file
+
+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