Makefile: don't error out under DC_SHA1_EXTERNAL if DC_SHA1_SUBMODULE=auto

Fix a logic error in the initial introduction of DC_SHA1_EXTERNAL. If git.git has a sha1collisiondetection submodule checked out the logic to set DC_SHA1_SUBMODULE=auto would interact badly with the check for whether DC_SHA1_SUBMODULE was set. It would error out, meaning that there's no way to build git with DC_SHA1_EXTERNAL=YesPlease without deinit-ing the submodule. Instead, adjust the logic to only fire if the variable is to something else than "auto" which would mean it's a mistake on the part of whoever's building git, not just the Makefile tripping over its own logic. 1. 3964cbbb5c ("sha1dc: allow building with the external sha1dc library", 2017-08-15) 2. cac87dc01d ("sha1collisiondetection: automatically enable when submodule is populated", 2017-07-01) Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ævar Arnfjörð Bjarmason committed Dec 8, 2017 at 22:29 UTC f39e05f225a8e65d729e295c9146af1c2a54700a
1 file changed +2
Makefile
+2
@@ -1497,7 +1497,9 @@ else
1497 LIB_OBJS += sha1dc_git.o
1498 ifdef DC_SHA1_EXTERNAL
1499 ifdef DC_SHA1_SUBMODULE
1500 + ifneq ($(DC_SHA1_SUBMODULE),auto)
1501 $(error Only set DC_SHA1_EXTERNAL or DC_SHA1_SUBMODULE, not both)
1502 + endif
1503 endif
1504 BASIC_CFLAGS += -DDC_SHA1_EXTERNAL
1505 EXTLIBS += -lsha1detectcoll