From c85a932d4da17c7b9bdd50618f294461a953dbcd Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 21 Oct 2012 15:41:33 +0530
Subject: [PATCH] ...

---
 setup/build_environment.py |  6 ++++++
 setup/extensions.py        | 11 +++++------
 src/calibre/test_build.py  |  3 ++-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/setup/build_environment.py b/setup/build_environment.py
index 69b1dc231b..6601578345 100644
--- a/setup/build_environment.py
+++ b/setup/build_environment.py
@@ -95,6 +95,9 @@ chmlib_inc_dirs = chmlib_lib_dirs = []
 sqlite_inc_dirs = []
 icu_inc_dirs = []
 icu_lib_dirs = []
+zlib_inc_dirs = []
+zlib_lib_dirs = []
+zlib_libs = ['z']
 
 if iswindows:
     prefix  = r'C:\cygwin\home\kovid\sw'
@@ -118,6 +121,9 @@ if iswindows:
     ft_lib_dirs = [sw_lib_dir]
     ft_libs = ['freetype']
     ft_inc_dirs = [sw_inc_dir]
+    zlib_inc_dirs = [sw_inc_dir]
+    zlib_lib_dirs = [sw_lib_dir]
+    zlib_libs = ['zlib']
 
     magick_inc_dirs = [os.path.join(prefix, 'build', 'ImageMagick-6.7.6')]
     magick_lib_dirs = [os.path.join(magick_inc_dirs[0], 'VisualMagick', 'lib')]
diff --git a/setup/extensions.py b/setup/extensions.py
index 8d49f904b7..989a9ddbe9 100644
--- a/setup/extensions.py
+++ b/setup/extensions.py
@@ -17,7 +17,8 @@ from setup.build_environment import (fc_inc, fc_lib, chmlib_inc_dirs, fc_error,
         podofo_inc, podofo_lib, podofo_error, pyqt, OSX_SDK, NMAKE, QMAKE,
         msvc, MT, win_inc, win_lib, win_ddk, magick_inc_dirs, magick_lib_dirs,
         magick_libs, chmlib_lib_dirs, sqlite_inc_dirs, icu_inc_dirs,
-        icu_lib_dirs, win_ddk_lib_dirs, ft_libs, ft_lib_dirs, ft_inc_dirs)
+        icu_lib_dirs, win_ddk_lib_dirs, ft_libs, ft_lib_dirs, ft_inc_dirs,
+        zlib_libs, zlib_lib_dirs, zlib_inc_dirs)
 MT
 isunix = islinux or isosx or isbsd
 
@@ -50,10 +51,6 @@ class Extension(object):
 reflow_sources = glob.glob(os.path.join(SRC, 'calibre', 'ebooks', 'pdf', '*.cpp'))
 reflow_headers = glob.glob(os.path.join(SRC, 'calibre', 'ebooks', 'pdf', '*.h'))
 
-woff_libs = ['z']
-if iswindows:
-    woff_libs = ['zlib']
-
 icu_libs = ['icudata', 'icui18n', 'icuuc', 'icuio']
 icu_cflags = []
 if iswindows:
@@ -138,7 +135,9 @@ extensions = [
         headers=[
         'calibre/utils/fonts/woff/woff.h',
         'calibre/utils/fonts/woff/woff-private.h'],
-        libraries=woff_libs
+        libraries=zlib_libs,
+        lib_dirs=zlib_lib_dirs,
+        inc_dirs=zlib_inc_dirs,
         ),
 
 
diff --git a/src/calibre/test_build.py b/src/calibre/test_build.py
index 8bf3427f8c..8ca0a36528 100644
--- a/src/calibre/test_build.py
+++ b/src/calibre/test_build.py
@@ -33,7 +33,7 @@ def test_lxml():
         raise RuntimeError('lxml failed')
 
 def test_freetype():
-    from calibre.utils.fonts.freetype import test
+    from calibre.utils.fonts.free_type import test
     test()
     print ('FreeType OK!')
 
@@ -117,6 +117,7 @@ def test_wpd():
 def test_woff():
     from calibre.utils.fonts.woff import test
     test()
+    print ('WOFF ok!')
 
 def test():
     test_plugins()