From 25bb30c9b83a3bc93fe6d4ba6fe6ad61beeecb3b Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Sat, 2 Jul 2016 11:54:02 -0500
Subject: [PATCH] [libpng16] Added "Common linking failures" section to INSTALL
---
ANNOUNCE | 5 +++--
CHANGES | 3 ++-
INSTALL | 33 +++++++++++++--------------------
3 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/ANNOUNCE b/ANNOUNCE
index 9210b4547..cee5a4706 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,4 +1,4 @@
-Libpng 1.6.24beta03 - July 1, 2016
+Libpng 1.6.24beta03 - July 2, 2016
This is not intended to be a public release. It will be replaced
within a few weeks by a public version or by another test version.
@@ -67,12 +67,13 @@ Version 1.6.24beta02 [June 23, 2016]
structure padding is fixable, but it would be a signficant change (moving
structure members around).
-Version 1.6.24beta03 [July 1, 2016]
+Version 1.6.24beta03 [July 2, 2016]
Optimized absolute value calculation in filter selection, similar to
code in the PAETH decoder in pngrutil.c. Build with PNG_USE_ABS to
use this.
Added pngcp to the build together with a pngcp.dfa configuration test.
Added high resolution timing to pngcp.
+ Added "Common linking failures" section to INSTALL.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
diff --git a/CHANGES b/CHANGES
index 04549f258..2b4704841 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5638,12 +5638,13 @@ Version 1.6.24beta02 [June 23, 2016]
structure padding is fixable, but it would be a signficant change (moving
structure members around).
-Version 1.6.24beta03 [July 1, 2016]
+Version 1.6.24beta03 [July 2, 2016]
Optimized absolute value calculation in filter selection, similar to
code in the PAETH decoder in pngrutil.c. Build with PNG_USE_ABS to
use this.
Added pngcp to the build together with a pngcp.dfa configuration test.
Added high resolution timing to pngcp.
+ Added "Common linking failures" section to INSTALL.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
diff --git a/INSTALL b/INSTALL
index ca651e420..663ac25ed 100644
--- a/INSTALL
+++ b/INSTALL
@@ -18,7 +18,8 @@ VIII. Configuring libpng for 16-bit platforms
XIII. Removing unwanted object code
XIV. Changes to the build and configuration of libpng in libpng-1.5.x
XV. Setjmp/longjmp issues
- XVI. Other sources of information about libpng
+ XVI. Common linking failures
+XVII. Other sources of information about libpng
I. Simple installation
@@ -382,28 +383,20 @@ This requires setjmp/longjmp, so you must either build the library
with PNG_SETJMP_SUPPORTED defined, or with PNG_SIMPLIFIED_READ_SUPPORTED
and PNG_SIMPLIFIED_WRITE_SUPPORTED undefined.
-XVI. Other sources of information about libpng:
+XVI. Common linking failures
-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.
-=================================================
+If your application fails to find libpng or zlib entries while linking:
-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)
+ Be sure "-lz" appears after "-lpng" on your linking command.
-CFLAGS="-Wall -O -funroll-loops \
--malign-loops=2 -malign-functions=2" ./configure --prefix=/usr/include \
---with-pkgconfigdir=/usr/lib/pkgconfig --includedir=/usr/include
+ Be sure you have built libpng, zlib, and your application for the
+ same platform (e.g., 32-bit or 64-bit).
-You can alternatively specify --includedir=/usr/include, /usr/local/include,
-/usr/include/libpng16, or whatever.
+ If you are using the vstudio project, observe the WARNING in
+ project/vstudio/README.txt.
-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.
+XVII. Other sources of information about libpng:
+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.
--
GitLab