bootstrap.conf: declare bootstrap sync in configuration file

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/autogen.sh b/autogen.sh
index 9afad8f9d556626927cd3aa4efcaebf8a4e40f69..a119b099cb7659d7a80c0f10efb5980e6032b185 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -147,7 +147,7 @@ if test -d .git || test -f .git; then
             dry_run=2
         else
             echo "Running bootstrap..."
-            ./bootstrap$no_git --bootstrap-sync || {
+            ./bootstrap$no_git || {
                 die "bootstrap failed"
             }
             gnulib_hash >"$state_file"

diff --git a/bootstrap.conf b/bootstrap.conf
index b4020ab8ad89c60fca17814850c020065c3819d8..13dd239fd1236fe07d93c159cd28e6946aa6bd06 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -79,6 +79,8 @@ SKIP_PO=true
 
 copy=true
 
+bootstrap_sync=true
+
 
 # Tell gnulib to:
 #   require LGPLv2+