diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-07 18:17:20 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-07 18:17:20 -0800 |
| commit | 03800743156fe4f331a10c0983b9d633bed3a687 (patch) | |
| tree | 56b7e501ff7ebaf057849108c839fff569aa8f39 /Makefile | |
| parent | 7481ebe9918771a9269c7fd0e91e855f18f2bc52 (diff) | |
| parent | 609a2289d76fd9a7dddceabc63d1654fe61e0ffb (diff) | |
| download | git-03800743156fe4f331a10c0983b9d633bed3a687.tar.gz git-03800743156fe4f331a10c0983b9d633bed3a687.tar.xz | |
Merge branch 'ds/maint-deflatebound'
* ds/maint-deflatebound:
Improve accuracy of check for presence of deflateBound.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -98,6 +98,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. @@ -661,6 +663,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 |