cheng/libpng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[devel] Removed -D_ALLSOURCE from configure.ac, makefile.aix,

Browse Source 
and CMakeLists.txt, and changed the name of png_ptr->jmpbuf in pngstruct.h
to png_ptr->png_jmpbuf.
This commit is contained in:
Glenn Randers-Pehrson 2010-02-19 14:11:03 -06:00
parent 69e238b098
commit a24fc2e1d3
6 changed files with 33 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ANNOUNCE
View File

@ -1,5 +1,5 @@
Libpng 1.5.0beta08 - February 19, 2010 Libpng 1.5.0beta09 - February 19, 2010
This is not intended to be a public release. It will be replaced 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. within a few weeks by a public version or by another test version.
@ -9,20 +9,20 @@ Files available for download:
Source files with LF line endings (for Unix/Linux) and with a Source files with LF line endings (for Unix/Linux) and with a
"configure" script "configure" script
1.5.0beta08.tar.xz (LZMA-compressed, recommended) 1.5.0beta09.tar.xz (LZMA-compressed, recommended)
1.5.0beta08.tar.gz 1.5.0beta09.tar.gz
1.5.0beta08.tar.bz2 1.5.0beta09.tar.bz2
Source files with CRLF line endings (for Windows), without the Source files with CRLF line endings (for Windows), without the
"configure" script "configure" script
lp150b08.zip lp150b09.zip
lp150b08.7z lp150b09.7z
Other information: Other information:
1.5.0beta08-README.txt 1.5.0beta09-README.txt
1.5.0beta08-LICENSE.txt 1.5.0beta09-LICENSE.txt
Changes since the last public release (1.4.1): Changes since the last public release (1.4.1):
@ -65,6 +65,10 @@ version 1.5.0beta08 [February 19, 2010]
Added -D_ALLSOURCE in configure.ac, makefile.aix, and CMakeLists.txt Added -D_ALLSOURCE in configure.ac, makefile.aix, and CMakeLists.txt
when building on AIX. when building on AIX.
version 1.5.0beta09 [February 19, 2010]
Removed -D_ALLSOURCE from configure.ac, makefile.aix, and CMakeLists.txt.
Changed the name of png_ptr->jmpbuf in pngstruct.h
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement https://lists.sourceforge.net/lists/listinfo/png-mng-implement

4
CHANGES
View File

@ -2542,6 +2542,10 @@ version 1.5.0beta08 [February 19, 2010]
Added -D_ALLSOURCE in configure.ac, makefile.aix, and CMakeLists.txt Added -D_ALLSOURCE in configure.ac, makefile.aix, and CMakeLists.txt
when building on AIX. when building on AIX.
version 1.5.0beta09 [February 19, 2010]
Removed -D_ALLSOURCE from configure.ac, makefile.aix, and CMakeLists.txt.
Changed the name of png_ptr->jmpbuf in pngstruct.h
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement https://lists.sourceforge.net/lists/listinfo/png-mng-implement

6
CMakeLists.txt
View File

@ -125,10 +125,6 @@ set(pngtest_sources
add_definitions(-DPNG_CONFIGURE_LIBPNG) add_definitions(-DPNG_CONFIGURE_LIBPNG)
if (_AIX)
add_definitions(-D_ALLSOURCE)
endif(_AIX)
if(MSVC) if(MSVC)
add_definitions(-DPNG_NO_MODULEDEF -D_CRT_SECURE_NO_DEPRECATE) add_definitions(-DPNG_NO_MODULEDEF -D_CRT_SECURE_NO_DEPRECATE)
endif(MSVC) endif(MSVC)
@ -213,7 +209,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng-config.in
# SET UP LINKS # SET UP LINKS
if(PNG_SHARED) if(PNG_SHARED)
set_target_properties(${PNG_LIB_NAME} PROPERTIES set_target_properties(${PNG_LIB_NAME} PROPERTIES
# VERSION 15.${PNGLIB_RELEASE}.1.5.0beta08 # VERSION 15.${PNGLIB_RELEASE}.1.5.0beta09
VERSION 15.${PNGLIB_RELEASE}.0 VERSION 15.${PNGLIB_RELEASE}.0
SOVERSION 15 SOVERSION 15
CLEAN_DIRECT_OUTPUT 1) CLEAN_DIRECT_OUTPUT 1)

30
configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for libpng 1.5.0beta08. # Generated by GNU Autoconf 2.65 for libpng 1.5.0beta09.
# #
# Report bugs to <png-mng-implement@lists.sourceforge.net>. # Report bugs to <png-mng-implement@lists.sourceforge.net>.
# #
@ -701,8 +701,8 @@ MAKEFLAGS=
# Identity of this package. # Identity of this package.
PACKAGE_NAME='libpng' PACKAGE_NAME='libpng'
PACKAGE_TARNAME='libpng' PACKAGE_TARNAME='libpng'
PACKAGE_VERSION='1.5.0beta08' PACKAGE_VERSION='1.5.0beta09'
PACKAGE_STRING='libpng 1.5.0beta08' PACKAGE_STRING='libpng 1.5.0beta09'
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
PACKAGE_URL='' PACKAGE_URL=''
@ -1432,7 +1432,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures libpng 1.5.0beta08 to adapt to many kinds of systems. \`configure' configures libpng 1.5.0beta09 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1502,7 +1502,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of libpng 1.5.0beta08:";; short | recursive ) echo "Configuration of libpng 1.5.0beta09:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@ -1607,7 +1607,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
libpng configure 1.5.0beta08 libpng configure 1.5.0beta09
generated by GNU Autoconf 2.65 generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc. Copyright (C) 2009 Free Software Foundation, Inc.
@ -2032,7 +2032,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by libpng $as_me 1.5.0beta08, which was It was created by libpng $as_me 1.5.0beta09, which was
generated by GNU Autoconf 2.65. Invocation command line was generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@ $ $0 $@
@ -2840,7 +2840,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE='libpng' PACKAGE='libpng'
VERSION='1.5.0beta08' VERSION='1.5.0beta09'
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
@ -2904,7 +2904,7 @@ fi
PNGLIB_VERSION=1.5.0beta08 PNGLIB_VERSION=1.5.0beta09
PNGLIB_MAJOR=1 PNGLIB_MAJOR=1
PNGLIB_MINOR=5 PNGLIB_MINOR=5
PNGLIB_RELEASE=0 PNGLIB_RELEASE=0
@ -11415,13 +11415,7 @@ else
fi fi
case $host_os in LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG
aix*)
LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG -D_ALLSOURCE;;
*)
LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG;;
esac
endif
LIBPNG_DEFINES=$LIBPNG_DEFINES LIBPNG_DEFINES=$LIBPNG_DEFINES
@ -12033,7 +12027,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by libpng $as_me 1.5.0beta08, which was This file was extended by libpng $as_me 1.5.0beta09, which was
generated by GNU Autoconf 2.65. Invocation command line was generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@ -12099,7 +12093,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\ ac_cs_version="\\
libpng config.status 1.5.0beta08 libpng config.status 1.5.0beta09
configured by $0, generated by GNU Autoconf 2.65, configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\" with options \\"\$ac_cs_config\\"

12
configure.ac
View File

@ -18,12 +18,12 @@ AC_PREREQ(2.59)
dnl Version number stuff here: dnl Version number stuff here:
AC_INIT([libpng], [1.5.0beta08], [png-mng-implement@lists.sourceforge.net]) AC_INIT([libpng], [1.5.0beta09], [png-mng-implement@lists.sourceforge.net])
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE
dnl stop configure from automagically running automake dnl stop configure from automagically running automake
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
PNGLIB_VERSION=1.5.0beta08 PNGLIB_VERSION=1.5.0beta09
PNGLIB_MAJOR=1 PNGLIB_MAJOR=1
PNGLIB_MINOR=5 PNGLIB_MINOR=5
PNGLIB_RELEASE=0 PNGLIB_RELEASE=0
@ -59,13 +59,7 @@ AC_CHECK_FUNCS([memset], , AC_ERROR([memset not found in libc]))
AC_CHECK_FUNCS([pow], , AC_CHECK_LIB(m, pow, , AC_ERROR([cannot find pow])) ) AC_CHECK_FUNCS([pow], , AC_CHECK_LIB(m, pow, , AC_ERROR([cannot find pow])) )
AC_CHECK_LIB(z, zlibVersion, , AC_ERROR([zlib not installed])) AC_CHECK_LIB(z, zlibVersion, , AC_ERROR([zlib not installed]))
case $host_os in LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG
aix*)
LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG -D_ALLSOURCE;;
*)
LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG;;
esac
endif
LIBPNG_DEFINES=$LIBPNG_DEFINES LIBPNG_DEFINES=$LIBPNG_DEFINES
AC_SUBST(LIBPNG_DEFINES) AC_SUBST(LIBPNG_DEFINES)

2
scripts/makefile.aix
View File

@ -46,7 +46,7 @@ LDDEBUG =
CRELEASE = -O2 CRELEASE = -O2
LDRELEASE = -s LDRELEASE = -s
WARNMORE=-W -Wall WARNMORE=-W -Wall
CFLAGS = -D_ALLSOURCE -I$(ZLIBINC) $(WARNMORE) $(CRELEASE) CFLAGS = -I$(ZLIBINC) $(WARNMORE) $(CRELEASE)
LDFLAGS = -L. -L$(ZLIBLIB) -lpng15 -lz -lm $(LDRELEASE) LDFLAGS = -L. -L$(ZLIBLIB) -lpng15 -lz -lm $(LDRELEASE)
# File extensions # File extensions