From 5086ea9245934ac91272b9c2e54b6f2c58c3965f Mon Sep 17 00:00:00 2001 From: Daniel Brooks Date: Tue, 21 Feb 2012 00:58:02 -0800 Subject: [PATCH 1/2] it'll fail if you don't have git, so mark that as required --- configure | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/configure b/configure index a910f6d9eabf5..41a65d38252e5 100755 --- a/configure +++ b/configure @@ -280,11 +280,10 @@ fi step_msg "looking for build programs" -probe_need CFG_PERL perl -probe_need CFG_PYTHON python python2.6 python2 python3 -probe_need CFG_CURL curl - -probe CFG_GIT git +probe_need CFG_PERL perl +probe_need CFG_PYTHON python python2.6 python2 python3 +probe_need CFG_CURL curl +probe_need CFG_GIT git probe CFG_CLANG clang++ probe CFG_GCC gcc probe CFG_LLVM_CONFIG llvm-config From 9ecd30bcaa8bfc43021fba4e9473a7f9d8a1c48f Mon Sep 17 00:00:00 2001 From: Daniel Brooks Date: Wed, 29 Feb 2012 10:18:04 -0800 Subject: [PATCH 2/2] only require git if the source looks like it was checked out from git, otherwise don't attempt to manage the submodules --- configure | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 874512681e0d2..7ecd812ce2d84 100755 --- a/configure +++ b/configure @@ -300,7 +300,17 @@ step_msg "looking for build programs" probe_need CFG_PERL perl probe_need CFG_PYTHON python python2.6 python2 python3 probe_need CFG_CURL curl -probe_need CFG_GIT git + +# If we have no git directory then we are probably a tarball distribution +# and shouldn't attempt to load submodules +if [ ! -e ${CFG_SRC_DIR}.git ] +then + msg "git: no git directory. disabling submodules" + CFG_DISABLE_MANAGE_SUBMODULES=1 +else + probe_need CFG_GIT git +fi + probe CFG_CLANG clang++ probe CFG_GCC gcc probe CFG_LLVM_CONFIG llvm-config