sha1collisiondetection: automatically enable when submodule is populated
If a user wants to experiment with the version of collision detecting sha1 from the submodule, the user needed to not just populate the submodule but also needed to turn the knob. A Makefile trick is easy enough to do so, so let's do this. When somebody with a copy of the submodule populated wants not to use it, that can be done by overriding it in config.mak or from the command line. Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>maint
parent
86cfd61e6b
commit
cac87dc01d
4
Makefile
4
Makefile
|
@ -989,6 +989,10 @@ EXTLIBS =
|
||||||
|
|
||||||
GIT_USER_AGENT = git/$(GIT_VERSION)
|
GIT_USER_AGENT = git/$(GIT_VERSION)
|
||||||
|
|
||||||
|
ifeq ($(wildcard sha1collisiondetection/lib/sha1.h),sha1collisiondetection/lib/sha1.h)
|
||||||
|
DC_SHA1_SUBMODULE = auto
|
||||||
|
endif
|
||||||
|
|
||||||
include config.mak.uname
|
include config.mak.uname
|
||||||
-include config.mak.autogen
|
-include config.mak.autogen
|
||||||
-include config.mak
|
-include config.mak
|
||||||
|
|
Loading…
Reference in New Issue