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

diff --git a/autogen.sh b/autogen.sh
index a1d7e27..794d25c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -14,18 +14,38 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Rebuild the autotools environment.
 
 set -e
 set -v
-export AUTOMAKE='automake --foreign'
-mkdir -p daemon/m4
-aclocal
-libtoolize
-autoreconf -i
-pushd daemon
-autoreconf -i
-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|sed 's/^[ +-]//;s/ .*//')
+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
+
+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 test $# == 0 && test -x ./config.status; then
+    ./config.status --recheck
+else
+    $CONFIGUREDIR/configure "$@"
+fi