aboutsummaryrefslogtreecommitdiff
path: root/scripts/git-submodule.sh
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2023-05-30 16:03:50 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2023-06-06 16:30:01 +0200
commit6f3ae23b29ad5831902e3ecdc7e443bbbf295bde (patch)
tree82599fa79d325c41b6d593182d15ce2e96862913 /scripts/git-submodule.sh
parent1f468152fb2d461f2a5f8838a3bea9fd6aaa2207 (diff)
configure: remove --with-git-submodules=
Reuse --enable/--disable-download to control git submodules as well. Adjust the error messages of git-submodule.sh to refer to the new option. Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'scripts/git-submodule.sh')
-rwxr-xr-xscripts/git-submodule.sh8
1 files changed, 3 insertions, 5 deletions
diff --git a/scripts/git-submodule.sh b/scripts/git-submodule.sh
index 38b55c90e1..11fad2137c 100755
--- a/scripts/git-submodule.sh
+++ b/scripts/git-submodule.sh
@@ -9,7 +9,7 @@ command=$1
shift
maybe_modules="$@"
-# if --with-git-submodules=ignore, do nothing
+# if not running in a git checkout, do nothing
test "$command" = "ignore" && exit 0
test -z "$GIT" && GIT=$(command -v git)
@@ -24,7 +24,7 @@ update_error() {
echo "enable use of a transparent proxy), please disable automatic"
echo "GIT submodule checkout with:"
echo
- echo " $ ./configure --with-git-submodules=validate"
+ echo " $ ./configure --disable-download"
echo
echo "and then manually update submodules prior to running make, with:"
echo
@@ -39,9 +39,7 @@ validate_error() {
echo "configured for validate only. Please run"
echo " scripts/git-submodule.sh update $maybe_modules"
echo "from the source directory or call configure with"
- echo " --with-git-submodules=update"
- echo "To disable GIT submodules validation, use"
- echo " --with-git-submodules=ignore"
+ echo " --enable-download"
fi
exit 1
}