diff options
| author | David Symonds <dsymonds@gmail.com> | 2007-11-07 14:24:28 +1100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-07 17:06:14 -0800 |
| commit | 609a2289d76fd9a7dddceabc63d1654fe61e0ffb (patch) | |
| tree | 1d1d2719a4936c8958259a1772a31b7f6baac6c8 /Makefile | |
| parent | 6d0618a820a20846d60b665897fcce600f452eec (diff) | |
| download | git-609a2289d76fd9a7dddceabc63d1654fe61e0ffb.tar.gz git-609a2289d76fd9a7dddceabc63d1654fe61e0ffb.tar.xz | |
Improve accuracy of check for presence of deflateBound.
ZLIB_VERNUM isn't defined in some zlib versions, so this patch does a proper
linking test in autoconf to see whether deflateBound exists in zlib. Also,
setting NO_DEFLATE_BOUND will also work for folk not using autoconf.
Signed-off-by: David Symonds <dsymonds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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. @@ -637,6 +639,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 |