diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-16 21:14:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-16 21:14:17 -0800 |
| commit | b574c8d846dbdbaaad1e96ae365d452bc5cd6d64 (patch) | |
| tree | c8adb9c388d4bc08bf00ec6153f1e7ea6e669a37 /Makefile | |
| parent | 0e06cc8b823144be16a9fc1f703126b68d20d3b5 (diff) | |
| parent | 609a2289d76fd9a7dddceabc63d1654fe61e0ffb (diff) | |
| download | git-b574c8d846dbdbaaad1e96ae365d452bc5cd6d64.tar.gz git-b574c8d846dbdbaaad1e96ae365d452bc5cd6d64.tar.xz | |
Merge branch 'ds/maint-deflatebound' into maint
* 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
@@ -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 |