diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-20 13:20:44 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-20 13:20:44 (GMT) |
| commit | ce276c42d95f8a7e83da371f33d9da32986a30eb (patch) | |
| tree | 7a088008a27c86d5d53a988cf9567244226b3fc4 /src/3rdparty/libtiff/SConstruct | |
| parent | d05f83919949fd9604e6d96858a8404c9a580def (diff) | |
| parent | 06f96dbdcaeeb82d57b8d1f23cbbd498ddfc88c2 (diff) | |
| download | Qt-ce276c42d95f8a7e83da371f33d9da32986a30eb.zip Qt-ce276c42d95f8a7e83da371f33d9da32986a30eb.tar.gz Qt-ce276c42d95f8a7e83da371f33d9da32986a30eb.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
license doc updated for libtiff 3.9.2
Our configuration and build modifications to libtiff
Add libtiff 3.9.2
Update license doc, .pro file and qjpeghandler for libjpeg 8
Our configuration and build modifications to libjpeg
Add libjpeg 8
Delete libjpeg 6b
Delete libtiff 3.8.2
Diffstat (limited to 'src/3rdparty/libtiff/SConstruct')
| -rw-r--r-- | src/3rdparty/libtiff/SConstruct | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/3rdparty/libtiff/SConstruct b/src/3rdparty/libtiff/SConstruct index 3285157..682246e 100644 --- a/src/3rdparty/libtiff/SConstruct +++ b/src/3rdparty/libtiff/SConstruct @@ -1,4 +1,4 @@ -# $Id: SConstruct,v 1.2 2006/03/23 14:54:00 dron Exp $ +# $Id: SConstruct,v 1.4 2007/02/24 15:03:47 dron Exp $ # Tag Image File Format (TIFF) Software # @@ -76,7 +76,7 @@ Export([ 'env', 'idir_prefix', 'idir_lib', 'idir_bin', 'idir_inc', 'idir_doc' ]) # Now proceed to system feature checks target_cpu, target_vendor, target_kernel, target_os = \ - os.popen("./config.guess").readlines()[0].split("-") + os.popen("./config/config.guess").readlines()[0].split("-") def Define(context, key, have): import SCons.Conftest @@ -132,6 +132,7 @@ if target_os != 'cygwin' \ # Check for system headers conf.CheckCHeader('assert.h') conf.CheckCHeader('fcntl.h') +conf.CheckCHeader('io.h') conf.CheckCHeader('limits.h') conf.CheckCHeader('malloc.h') conf.CheckCHeader('search.h') @@ -145,6 +146,7 @@ conf.CheckFunc('memmove') conf.CheckFunc('memset') conf.CheckFunc('mmap') conf.CheckFunc('pow') +conf.CheckFunc('setmode') conf.CheckFunc('sqrt') conf.CheckFunc('strchr') conf.CheckFunc('strrchr') |