← Back to branch summary

~ubuntu-branches/ubuntu/trusty/pillow/trusty

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2013-12-16 15:29:17 UTC
  • mfrom: (5.1.1 trusty-proposed)
  • Revision ID: package-import@ubuntu.com-20131216152917-gh1s5ebev138eeo1
Tags: 2.2.1-3ubuntu2
Include test images for the lcms2 support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
353
353
                        _add_directory(self.compiler.include_dirs, dir, 0)
354
354
 
355
355
        if feature.want('lcms'):
356
 
            if _find_include_file(self, "lcms.h"):
357
 
                if _find_library_file(self, "lcms"):
 
356
            if _find_include_file(self, "lcms2.h"):
 
357
                if _find_library_file(self, "lcms2"):
358
358
                    feature.lcms = "lcms"
359
359
 
360
360
        if _tkinter and _find_include_file(self, "tk.h"):
437
437
            if host_platform == "win32":
438
438
                extra.extend(["user32", "gdi32"])
439
439
            exts.append(Extension(
440
 
                "PIL._imagingcms", ["_imagingcms.c"], libraries=["lcms"] + extra))
 
440
                "PIL._imagingcms", ["_imagingcms.c"], libraries=["lcms2"] + extra))
441
441
 
442
442
        if os.path.isfile("_webp.c") and feature.webp:
443
443
            libs = ["webp"]
513
513
            (feature.zlib, "ZLIB (PNG/ZIP)"),
514
514
            (feature.tiff, "TIFF G3/G4 (experimental)"),
515
515
            (feature.freetype, "FREETYPE2"),
516
 
            (feature.lcms, "LITTLECMS"),
 
516
            (feature.lcms, "LITTLECMS2"),
517
517
            (feature.webp, "WEBP"),
518
518
            (feature.webpmux, "WEBPMUX"), ]
519
519