From 8dff7012bef31424578b697b8eab56262ddd8c33 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Mon, 23 Jan 2017 18:25:15 -0800 Subject: [PATCH] Check for git presence ... and make the optiont that fetch from Git repositories depend on the git discovery. Signed-off-by: Alexey Neyman --- config/binutils/binutils.in.2 | 3 ++- config/libc/mingw.in | 1 + configure.ac | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/config/binutils/binutils.in.2 b/config/binutils/binutils.in.2 index 336098b2..7a1291f9 100644 --- a/config/binutils/binutils.in.2 +++ b/config/binutils/binutils.in.2 @@ -11,13 +11,14 @@ choice config ELF2FLT_GIT bool prompt "git" + depends on CONFIGURE_has_git help Grab the latest version of elf2flt from the CVS repository config ELF2FLT_CUSTOM bool prompt "Custom elf2flt" - depends on EXPERIMENTAL + depends on EXPERIMENTAL || !CONFIGURE_has_git help The choosen elf2flt version shall be not downloaded. Instead use a custom location to get the source. diff --git a/config/libc/mingw.in b/config/libc/mingw.in index 0de5dacd..62e7a467 100644 --- a/config/libc/mingw.in +++ b/config/libc/mingw.in @@ -74,6 +74,7 @@ config WINAPI_V_DEVEL bool prompt "devel" depends on EXPERIMENTAL + depends on CONFIGURE_has_git endchoice diff --git a/configure.ac b/configure.ac index 76f0d30d..bb9fec5b 100644 --- a/configure.ac +++ b/configure.ac @@ -342,6 +342,9 @@ ACX_SET_KCONFIG_OPTION([cvs]) AC_CHECK_PROGS([svn], [svn]) ACX_SET_KCONFIG_OPTION([svn]) +AC_CHECK_PROGS([git], [git]) +ACX_SET_KCONFIG_OPTION([git]) + #-------------------------------------------------------------------- # Now, for some fun... #--------------------------------------------------------------------