build: invoke autopoint with --force

[libguestfs.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index ba4612c..649ca7b 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -21,7 +21,22 @@
 set -e
 set -v
 
+# 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=.