Commit 9f81a37aa416446726a00996dce01b02372a43b1
2011-03-16T23:02:31
Define NO_GZIP in zconf.h instead of at compile time
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e936bcf..1bd2430 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
diff --git a/deps/zlib/zconf.h b/deps/zlib/zconf.h
index ea765a5..494992a 100644
--- a/deps/zlib/zconf.h
+++ b/deps/zlib/zconf.h
@@ -10,6 +10,7 @@
#include "../../src/common.h"
+#define NO_GZIP
#define STDC
/* Jeez, don't complain about non-prototype
diff --git a/wscript b/wscript
index 6d5579f..4e8294c 100644
--- a/wscript
+++ b/wscript
@@ -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):