diff --git a/ANNOUNCE b/ANNOUNCE index de3c54d01..ed58821ac 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.5.15beta06 - February 19, 2013 +Libpng 1.5.15beta06 - February 22, 2013 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. @@ -57,9 +57,10 @@ Version 1.5.15beta05 [February 17, 2013] while building with a parallel make. Use parentheses more consistently in "#if defined(MACRO)" tests. -Version 1.5.15beta06 [February 19, 2013] +Version 1.5.15beta06 [February 22, 2013] Fixed PNG_ALIGN(ED)_MEMORY and add ability to turn off ARM_NEON runtime checks + Updated INSTALL. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 66d507915..a8661378e 100644 --- a/CHANGES +++ b/CHANGES @@ -4015,9 +4015,10 @@ Version 1.5.15beta05 [February 17, 2013] while building with a parallel make. Use parentheses more consistently in "#if defined(MACRO)" tests. -Version 1.5.15beta06 [February 19, 2013] +Version 1.5.15beta06 [February 22, 2013] Fixed PNG_ALIGN(ED)_MEMORY and add ability to turn off ARM_NEON runtime checks + Updated INSTALL. =========================================================================== NOTICE November 17, 2012: diff --git a/INSTALL b/INSTALL index e6979c6fb..972a4727e 100644 --- a/INSTALL +++ b/INSTALL @@ -9,16 +9,16 @@ On Unix/Linux and similar systems, you can simply type and ignore the rest of this document. -If configure does not work on your system and you have a reasonably -up-to-date set of tools, running ./autogen.sh before running ./configure -may fix the problem. You can also run the individual commands in -autogen.sh with the --force option, if supported by your version of -the tools. To be really sure that you aren't using any of the included -pre-built scripts, you can do this: +If configure does not work on your system, or if you have a need to +change configure.ac or Makefile.am, and you have a reasonably +up-to-date set of tools, running ./autogen.sh in a git clone before +running ./configure may fix the problem. To be really sure that you +aren't using any of the included pre-built scripts, you can do this: ./configure --enable-maintainer-mode make maintainer-clean - ./autogen.sh + ./autogen.sh --maintainer --clean + ./autogen.sh --maintainer ./configure [--prefix=/path] [other options] make make install @@ -41,16 +41,31 @@ is not already on your system. zlib can usually be found wherever you got libpng. zlib can be placed in another directory, at the same level as libpng. +If your system already has a preinstalled zlib you will still need +to have access to the zlib.h and zconf.h include files that +correspond to the version of zlib that's installed. + +If you wish to test with a particular zlib that is not first in the +standard library search path, put ZLIBLIB, ZLIBINC, INCLUDES, LDFLAGS, +LIBS, and LD_LIBRARY_PATH in your environment before running "make test" +or "make distcheck": + +ZLIBLIB=/path/to/lib export ZLIBLIB +ZLIBINC=/path/to/include export ZLIBINC +INCLUDES="-I$ZLIBINC" export INCLUDES +LDFLAGS="-L$ZLIBLIB" export LDFLAGS +LIBS=$ZLIBLIB/libz.a export LIBS +LD_LIBRARY_PATH="$ZLIBLIB:$LD_LIBRARY_PATH" export LD_LIBRARY_PATH + +If you are using one of the makefile scripts, put ZLIBLIB and ZLIBINC +in your environment and type "make ZLIBLIB=$ZLIBLIB ZLIBINC=$ZLIBINC test". + If you want to use "cmake" (see www.cmake.org), type cmake . -DCMAKE_INSTALL_PREFIX=/path make make install -If your system already has a preinstalled zlib you will still need -to have access to the zlib.h and zconf.h include files that -correspond to the version of zlib that's installed. - You can rename the directories that you downloaded (they might be called "libpng-x.y.z" or "libpngNN" and "zlib-1.2.5" or "zlib125") so that you have directories called "zlib" and "libpng". @@ -71,6 +86,7 @@ Your directory structure should look like this: depcomp, install-sh, mkinstalldirs, test-pngtest.sh contrib gregbook + libtests pngminim pngminus pngsuite