diff --git a/ANNOUNCE b/ANNOUNCE index a032fd0e7..8fcf54a9e 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.4.4beta07 - August 21, 2010 +Libpng 1.4.4beta07 - August 22, 2010 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. @@ -58,7 +58,7 @@ version 1.4.4beta06 [August 11, 2010] Don't try to use version-script with cygwin/mingw. Revised contrib/gregbook to work under cygwin/mingw. -version 1.4.4beta07 [August 21, 2010] +version 1.4.4beta07 [August 22, 2010] Updated prebuilt aclocal.m4 and ltmain.sh Add .dll.a to the list of extensions to be symlinked by Makefile.am (Yaakov) Updated CMakelists.txt to use CMAKE_INSTALL_LIBDIR variable; useful for @@ -66,6 +66,7 @@ version 1.4.4beta07 [August 21, 2010] Revised CMakeLists.txt to put the man pages in share/man/man* not man/man* Revised CMakeLists.txt to make symlinks instead of copies when installing. Changed PNG_LIB_NAME from pngNN to libpngNN in CMakeLists.txt (Philip Lowman) + Corrected the handling and documentation of the PNG_USER_PRIVATEBUILD flag. Send comments/corrections/commendations to glennrp at users.sourceforge.net or to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index fea76dd5c..67a6391b8 100644 --- a/CHANGES +++ b/CHANGES @@ -2642,7 +2642,7 @@ version 1.4.4beta06 [August 11, 2010] Don't try to use version-script with cygwin/mingw. Revised contrib/gregbook to work under cygwin/mingw. -version 1.4.4beta07 [August 21, 2010] +version 1.4.4beta07 [August 22, 2010] Updated prebuilt aclocal.m4 and ltmain.sh Add .dll.a to the list of extensions to be symlinked by Makefile.am (Yaakov) Updated CMakeLists.txt to use CMAKE_INSTALL_LIBDIR variable; useful for @@ -2650,6 +2650,7 @@ version 1.4.4beta07 [August 21, 2010] Revised CMakeLists.txt to put the man pages in share/man/man* not man/man* Revised CMakeLists.txt to make symlinks instead of copies when installing. Changed PNG_LIB_NAME from pngNN to libpngNN in CMakeLists.txt (Philip Lowman) + Corrected the handling and documentation of the PNG_USER_PRIVATEBUILD flag. Send comments/corrections/commendations to glennrp at users.sourceforge.net or to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/pngconf.h b/pngconf.h index e4d75e490..3c24fc9fe 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.4.4beta07 - August 13, 2010 + * libpng version 1.4.4beta07 - August 22, 2010 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2010 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -44,17 +44,15 @@ * includes the resource compiler for Windows DLL configurations. */ #ifdef PNG_USER_CONFIG +# include "pngusr.h" # ifndef PNG_USER_PRIVATEBUILD # define PNG_USER_PRIVATEBUILD # endif -# include "pngusr.h" #endif /* - * If you create a private DLL you need to define in "pngusr.h" the followings: - * #define PNG_USER_PRIVATEBUILD - * e.g. #define PNG_USER_PRIVATEBUILD "Build by MyCompany for xyz reasons." + * If you create a private DLL you need to define in "pngusr.h" the following: + * #define PNG_USER_PRIVATEBUILD (a flag) * #define PNG_USER_DLLFNAME_POSTFIX