Define NO_GZIP in zconf.h instead of at compile time

This commit is contained in:
Vicent Marti 2011-03-16 23:02:31 +02:00
parent 36aaf1ff1a
commit 9f81a37aa4
3 changed files with 1 additions and 6 deletions

View File

@ -75,9 +75,6 @@ FILE(GLOB SRC_SHA1 src/block-sha1/*.c)
FILE(GLOB SRC_PLAT src/unix/*.c)
FILE(GLOB SRC_H include/git2/*.h)
# Do not build Zlib with GZIP support
ADD_DEFINITIONS(-DNO_GZIP)
# On Windows use specific platform sources
IF (WIN32 AND NOT CYGWIN)
ADD_DEFINITIONS(-DWIN32 -D_DEBUG -D_LIB)

1
deps/zlib/zconf.h vendored
View File

@ -10,6 +10,7 @@
#include "../../src/common.h"
#define NO_GZIP
#define STDC
/* Jeez, don't complain about non-prototype

View File

@ -61,9 +61,6 @@ def configure(conf):
conf.env.PLATFORM = 'unix'
conf.check_cc(lib='pthread', uselib_store='pthread')
# Do not build ZLib with GZIP support
conf.env.DEFINES += ['NO_GZIP']
# check for sqlite3
if conf.options.use_sqlite and conf.check_cc(
lib='sqlite3', uselib_store='sqlite3', install_path=None, mandatory=False):