Merge pull request #553 from stilor/check-git

Check for git presence
This commit is contained in:
Alexey Neyman 2017-01-24 14:26:33 -08:00 committed by GitHub
commit 48bb11145d
3 changed files with 6 additions and 1 deletions

View File

@ -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.

View File

@ -74,6 +74,7 @@ config WINAPI_V_DEVEL
bool
prompt "devel"
depends on EXPERIMENTAL
depends on CONFIGURE_has_git
endchoice

View File

@ -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...
#--------------------------------------------------------------------