From 10973a581fd3f365078ee6f970694399afe6af96 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sat, 16 Oct 2010 19:40:09 -0500 Subject: [PATCH] [devel] Removed obsolete remarks about setjmp handling from INSTALL. --- ANNOUNCE | 1 + CHANGES | 1 + INSTALL | 15 +-------------- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 3d04cad19..cd6880e7e 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -428,6 +428,7 @@ Version 1.5.0beta53 [October 17, 2010] automake versions earlier than 1.11.1 Use document name "libpng.txt" instead of "libpng-version.txt" as it was prior to libpng-1.2.16beta2, to simplify version differences. + Removed obsolete remarks about setjmp handling from INSTALL. Send comments/corrections/commendations to png-mng-implement at lists.sf.net: (subscription required; visit diff --git a/CHANGES b/CHANGES index a1cd6b1ee..6f88ecbfa 100644 --- a/CHANGES +++ b/CHANGES @@ -3066,6 +3066,7 @@ Version 1.5.0beta53 [October 17, 2010] automake versions earlier than 1.11.1 Use document name "libpng.txt" instead of "libpng-version.txt" as it was prior to libpng-1.2.16beta2, to simplify version differences. + Removed obsolete remarks about setjmp handling from INSTALL. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/INSTALL b/INSTALL index d0d3e8024..5a217ab19 100644 --- a/INSTALL +++ b/INSTALL @@ -112,7 +112,7 @@ scripts directory into this directory, for example Read the makefile to see if you need to change any source or target directories to match your preferences. -Then read pngconf.h to see if you want to make any configuration +Then read pnglibconf.dfa to see if you want to make any configuration changes. Then just run "make" which will create the libpng library in @@ -130,19 +130,6 @@ do that, run "make install" in the zlib directory first if necessary). Some also allow you to run "make test-installed" after you have run "make install". -If you encounter a compiler error message complaining about the -lines - - __png.h__ already includes setjmp.h; - __dont__ include it again.; - -this means you have compiled another module that includes setjmp.h, -which is hazardous because the two modules might not include exactly -the same setjmp.h. If you are sure that you know what you are doing -and that they are exactly the same, then you can comment out or -delete the two lines. Better yet, use the cexcept interface -instead, as demonstrated in contrib/visupng of the libpng distribution. - Further information can be found in the README and libpng.txt files, in the individual makefiles, in png.h, and the manual pages libpng.3 and png.5.