summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2017-01-24 22:26:33 (GMT)
committerGitHub <noreply@github.com>2017-01-24 22:26:33 (GMT)
commit48bb11145de60a70cb28456d006f14a65033a758 (patch)
treea901942d70464773a216f9d80a8ccbc74f645bab
parent65e037b654eb1dc1cbef649269969a3cf9aa4adc (diff)
parent8dff7012bef31424578b697b8eab56262ddd8c33 (diff)
Merge pull request #553 from stilor/check-git
Check for git presence
-rw-r--r--config/binutils/binutils.in.23
-rw-r--r--config/libc/mingw.in1
-rw-r--r--configure.ac3
3 files changed, 6 insertions, 1 deletions
diff --git a/config/binutils/binutils.in.2 b/config/binutils/binutils.in.2
index 336098b..7a1291f 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 0de5dac..62e7a46 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 76f0d30..bb9fec5 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...
#--------------------------------------------------------------------