From 9f81a37aa416446726a00996dce01b02372a43b1 Mon Sep 17 00:00:00 2001
From: Vicent Marti <tanoku@gmail.com>
Date: Wed, 16 Mar 2011 23:02:31 +0200
Subject: [PATCH] Define NO_GZIP in zconf.h instead of at compile time

---
 CMakeLists.txt    | 3 ---
 deps/zlib/zconf.h | 1 +
 wscript           | 3 ---
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e936bcf1d..1bd243099 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 ea765a54c..494992aba 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 6d5579fef..4e8294c9f 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):