Merge branch 'bs/maint-commit-options' into maint

[git.git] / Makefile

diff --git a/Makefile b/Makefile
index 41c90ad1d49c92829cd678f5f4ce8ad9f2e05985..e0cfff35b627f2e6b31cdc2909de2b3d612b2fc5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -94,6 +94,8 @@ all::
 # Define OLD_ICONV if your library has an old iconv(), where the second
 # (input buffer pointer) parameter is declared with type (const char **).
 #
+# Define NO_DEFLATE_BOUND if your zlib does not have deflateBound.
+#
 # Define NO_R_TO_GCC_LINKER if your gcc does not like "-R/path/lib"
 # that tells runtime paths to dynamic libraries;
 # "-Wl,-rpath=/path/lib" is used instead.
@@ -639,6 +641,10 @@ ifdef OLD_ICONV
        BASIC_CFLAGS += -DOLD_ICONV
 endif
 
+ifdef NO_DEFLATE_BOUND
+       BASIC_CFLAGS += -DNO_DEFLATE_BOUND
+endif
+
 ifdef PPC_SHA1
        SHA1_HEADER = "ppc/sha1.h"
        LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o