diff options
author | aavit <qt_aavit@ovi.com> | 2012-04-16 13:34:47 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-17 10:15:48 +0200 |
commit | 1fa1ce36288e3e537e9e4db1cfa42b338b5b7e58 (patch) | |
tree | 4e5da0ca30844b42f3748413ea85095509c6fff1 /src/3rdparty/libpng/INSTALL | |
parent | 93055e81c83c02b88630ee6f5bb243ab42b2fad6 (diff) |
Upgrading libpng: Adding clean copy of libpng 1.5.10
This commit removes the previous version of the bundled libpng
(1.5.4), as well as all local modifications to it. It adds an
unmodified copy of the official libpng source distribution, except
that various extraneous files have been removed, as usual.
The patches required to build it in Qt will follow in separate
commit(s).
Change-Id: I90149f87fc889c44a3b60b21cdf755020f3a8e39
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Diffstat (limited to 'src/3rdparty/libpng/INSTALL')
-rw-r--r-- | src/3rdparty/libpng/INSTALL | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/src/3rdparty/libpng/INSTALL b/src/3rdparty/libpng/INSTALL index 353bfff326..e6979c6fb0 100644 --- a/src/3rdparty/libpng/INSTALL +++ b/src/3rdparty/libpng/INSTALL @@ -133,3 +133,23 @@ run "make install". Further information can be found in the README and libpng-manual.txt files, in the individual makefiles, in png.h, and the manual pages libpng.3 and png.5. + +Using the ./configure script -- 16 December 2002. +================================================= + +The ./configure script should work compatibly with what scripts/makefile.* +did, however there are some options you might need to add to configure +explicitly, which previously was done semi-automatically (if you didn't edit +scripts/makefile.* yourself, that is) + +CFLAGS="-Wall -O -funroll-loops \ +-malign-loops=2 -malign-functions=2" ./configure --prefix=/usr/include \ +--with-pkgconfigdir=/usr/lib/pkgconfig --includedir=/usr/include + +You can alternatively specify --includedir=/usr/include, /usr/local/include, +/usr/include/libpng%NN%, or whatever. + +If you find that the configure script is out-of-date or is not supporting +your platform properly, try running autogen.sh to regenerate "configure", +"Makefile.in", and the other configuration files. Then try configure again. + |