diff options
| author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2009-08-07 06:32:35 (GMT) |
|---|---|---|
| committer | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2009-08-07 06:47:59 (GMT) |
| commit | 8efe6915c9a6dfa531ec39d5de7e8af34f76dc3c (patch) | |
| tree | d571045fb85632e7713b75e46d0e23ea5656d3b0 | |
| parent | ea181f7fa681815f27b633ba0b3b0c2754c1a753 (diff) | |
| download | Qt-8efe6915c9a6dfa531ec39d5de7e8af34f76dc3c.zip Qt-8efe6915c9a6dfa531ec39d5de7e8af34f76dc3c.tar.gz Qt-8efe6915c9a6dfa531ec39d5de7e8af34f76dc3c.tar.bz2 | |
Avoid compiling imageformats if you configure with -no-lib*
Task-number: 239108
Reviewed-by: Andy Shaw
| -rwxr-xr-x | configure | 12 |
1 files changed, 9 insertions, 3 deletions
@@ -5706,7 +5706,9 @@ fi if [ "$CFG_INOTIFY" = "yes" ]; then QT_CONFIG="$QT_CONFIG inotify" fi -if [ "$CFG_LIBJPEG" = "system" ]; then +if [ "$CFG_LIBJPEG" = "no" ]; then + CFG_JPEG="no" +elif [ "$CFG_LIBJPEG" = "system" ]; then QT_CONFIG="$QT_CONFIG system-jpeg" fi if [ "$CFG_JPEG" = "no" ]; then @@ -5714,7 +5716,9 @@ if [ "$CFG_JPEG" = "no" ]; then elif [ "$CFG_JPEG" = "yes" ]; then QT_CONFIG="$QT_CONFIG jpeg" fi -if [ "$CFG_LIBMNG" = "system" ]; then +if [ "$CFG_LIBMNG" = "no" ]; then + CFG_MNG="no" +elif [ "$CFG_LIBMNG" = "system" ]; then QT_CONFIG="$QT_CONFIG system-mng" fi if [ "$CFG_MNG" = "no" ]; then @@ -5738,7 +5742,9 @@ if [ "$CFG_GIF" = "no" ]; then elif [ "$CFG_GIF" = "yes" ]; then QT_CONFIG="$QT_CONFIG gif" fi -if [ "$CFG_LIBTIFF" = "system" ]; then +if [ "$CFG_LIBTIFF" = "no" ]; then + CFG_TIFF="no" +elif [ "$CFG_LIBTIFF" = "system" ]; then QT_CONFIG="$QT_CONFIG system-tiff" fi if [ "$CFG_TIFF" = "no" ]; then |