diff options
| author | Darrell Anderson <[email protected]> | 2012-04-30 16:18:56 -0500 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2012-04-30 16:18:56 -0500 |
| commit | 9179f76e973aac3ac89ba65a20368f5190e28dba (patch) | |
| tree | 5f09ca13be6e41320c5013625bf2b5854443ef36 /configure | |
| parent | 2c39fddda7977759d5a2b2c991d8c21c7ae915e4 (diff) | |
| parent | 4e0674395047ad477209f57312f30cbf58375f8b (diff) | |
| download | qt3-9179f76e973aac3ac89ba65a20368f5190e28dba.tar.gz qt3-9179f76e973aac3ac89ba65a20368f5190e28dba.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/qt3
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 8 |
1 files changed, 2 insertions, 6 deletions
@@ -257,7 +257,7 @@ CFG_ZLIB=yes CFG_PNG=yes CFG_LIBPNG=qt CFG_JPEG=auto -CFG_LIBJPEG=qt +CFG_LIBJPEG=system CFG_MNG=auto CFG_LIBMNG=qt CFG_XCURSOR=auto @@ -1989,7 +1989,7 @@ Usage: $relconf [-prefix dir] [-buildkey key] [-docdir dir] [-headerdir dir] [-libdir dir] [-bindir dir] [-plugindir dir ] [-datadir dir] [-translationdir dir] [-sysconfdir dir] [-debug] [-release] [-no-gif] [-qt-gif] [-no-sm] [-sm] [-qt-zlib] [-system-zlib] - [-qt-libjpeg] [-system-libjpeg] [-qt-libpng] [-system-libpng] + [-qt-libpng] [-system-libpng] [-qt-libmng] [-system-libmng] [-no-thread] [-thread] [-no-nis] [-nis] [-no-cups] [-cups] [-no-largefile] [-largefile] [-version-script] [-no-stl] [-stl] [-no-ipv6 ] [-ipv6] [-Istring] [-lstring] @@ -2147,10 +2147,6 @@ Third Party Image Loading Libraries: -system-libpng ..... Use libpng from the operating system. See http://www.libpng.org/pub/png - * -qt-libjpeg ........ Use the libjpeg bundled with Qt. - -system-libjpeg .... Use jpeglib from the operating system. - See http://www.ijg.org - * -qt-libmng ......... Use the libmng bundled with Qt. -system-libmng ..... Use libmng from the operating system. See http://www.libmng.com |