git-merge: no reason to use cpio anymore

[git.git] / Makefile

diff --git a/Makefile b/Makefile
index 78cdaa155ba424475fe091cd19cf212e32fcfc2f..40567ece1430e6d59c7f877f9f5861505d22d419 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -124,6 +124,9 @@ all::
 # If not set it defaults to the bare 'wish'. If it is set to the empty
 # string then NO_TCLTK will be forced (this is used by configure script).
 #
+# Define THREADED_DELTA_SEARCH if you have pthreads and wish to exploit
+# parallel delta searching when packing objects.
+#
 
 GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
        @$(SHELL_PATH) ./GIT-VERSION-GEN
@@ -675,6 +678,11 @@ ifdef NO_MEMMEM
        COMPAT_OBJS += compat/memmem.o
 endif
 
+ifdef THREADED_DELTA_SEARCH
+       BASIC_CFLAGS += -DTHREADED_DELTA_SEARCH
+       EXTLIBS += -lpthread
+endif
+
 ifeq ($(TCLTK_PATH),)
 NO_TCLTK=NoThanks
 endif