1At least lcms wasn't deterministicly detected from sysroot.
2
3This will allow to export LCMS_ENABLED=False when lcms isn't in PACKAGECONFIG.
4
5Upstream-Status: Inappropriate [configuration]
6
7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
8
9diff -uNr Imaging-1.1.7.orig/setup.py Imaging-1.1.7/setup.py
10--- Imaging-1.1.7.orig/setup.py	2013-07-22 10:17:02.081457075 +0200
11+++ Imaging-1.1.7/setup.py	2013-07-22 13:10:09.029707492 +0200
12@@ -39,6 +39,12 @@
13 TIFF_ROOT = None
14 FREETYPE_ROOT =  os.environ['STAGING_LIBDIR'], os.environ['STAGING_INCDIR']
15 LCMS_ROOT = None
16+TCL_ENABLED = os.getenv('TCL_ENABLED', "True")
17+JPEG_ENABLED = os.getenv('JPEG_ENABLED', "True")
18+ZLIB_ENABLED = os.getenv('ZLIB_ENABLED', "True")
19+TIFF_ENABLED = os.getenv('TIFF_ENABLED', "True")
20+FREETYPE_ENABLED = os.getenv('FREETYPE_ENABLED', "True")
21+LCMS_ENABLED = os.getenv('LCMS_ENABLED', "True")
22
23 # FIXME: add mechanism to explicitly *disable* the use of a library
24
25@@ -220,22 +226,22 @@
26             zlib = jpeg = tiff = freetype = tcl = tk = lcms = None
27         feature = feature()
28
29-        if find_include_file(self, "zlib.h"):
30+        if ZLIB_ENABLED == 'True' and find_include_file(self, "zlib.h"):
31             if find_library_file(self, "z"):
32                 feature.zlib = "z"
33             elif sys.platform == "win32" and find_library_file(self, "zlib"):
34                 feature.zlib = "zlib" # alternative name
35
36-        if find_include_file(self, "jpeglib.h"):
37+        if JPEG_ENABLED == 'True' and find_include_file(self, "jpeglib.h"):
38             if find_library_file(self, "jpeg"):
39                 feature.jpeg = "jpeg"
40             elif sys.platform == "win32" and find_library_file(self, "libjpeg"):
41                 feature.jpeg = "libjpeg" # alternative name
42
43-        if find_library_file(self, "tiff"):
44+        if TIFF_ENABLED == 'True' and find_library_file(self, "tiff"):
45             feature.tiff = "tiff"
46
47-        if find_library_file(self, "freetype"):
48+        if FREETYPE_ENABLED == 'True' and find_library_file(self, "freetype"):
49             # look for freetype2 include files
50             freetype_version = 0
51             for dir in self.compiler.include_dirs:
52@@ -256,11 +262,11 @@
53                 if dir:
54                     add_directory(self.compiler.include_dirs, dir, 0)
55
56-        if find_include_file(self, "lcms.h"):
57+        if LCMS_ENABLED == 'True' and find_include_file(self, "lcms.h"):
58             if find_library_file(self, "lcms"):
59                 feature.lcms = "lcms"
60
61-        if _tkinter and find_include_file(self, "tk.h"):
62+        if TCL_ENABLED == 'True' and _tkinter and find_include_file(self, "tk.h"):
63             # the library names may vary somewhat (e.g. tcl84 or tcl8.4)
64             version = TCL_VERSION[0] + TCL_VERSION[2]
65             if find_library_file(self, "tcl" + version):
66