summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-04-30 02:15:44 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-04-30 02:15:44 -0500
commit63981126155b4f959f42446fc91742441446a040 (patch)
treeb86ef61a7aecbfbf027a51c01ae60ae76f7e1894 /configure
parentf3c5f3ba06eb7394303c6500094f6d1f58d4092a (diff)
downloadtqt3-63981126155b4f959f42446fc91742441446a040.tar.gz
tqt3-63981126155b4f959f42446fc91742441446a040.zip
Update from Qt3
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure8
1 files changed, 2 insertions, 6 deletions
diff --git a/configure b/configure
index 11b0a776..31372c54 100755
--- a/configure
+++ b/configure
@@ -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