[legacy] Define _ALL_SOURCE in pngconf.h when building with AIX compiler.

Otherwise AIX reserves "jmpbuf" and renames it to "__jmpbuf".
This commit is contained in:
Glenn Randers-Pehrson 2010-02-19 10:51:06 -06:00
parent 92960c86a2
commit a89dc3acff
6 changed files with 62 additions and 36 deletions

View File

@ -1,5 +1,5 @@
Libpng 1.2.43rc01 - February 18, 2010 Libpng 1.2.43rc02 - February 20, 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,36 +9,36 @@ 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
libpng-1.2.43rc01.tar.xz (LZMA-compressed, recommended) libpng-1.2.43rc02.tar.xz (LZMA-compressed, recommended)
libpng-1.2.43rc01.tar.gz libpng-1.2.43rc02.tar.gz
libpng-1.2.43rc01.tar.bz2 libpng-1.2.43rc02.tar.bz2
Source files with LF line endings (for Unix/Linux) without the Source files with LF line endings (for Unix/Linux) without the
"configure" script "configure" script
libpng-1.2.43rc01-no-config.tar.xz (LZMA-compressed, recommended) libpng-1.2.43rc02-no-config.tar.xz (LZMA-compressed, recommended)
libpng-1.2.43rc01-no-config.tar.gz libpng-1.2.43rc02-no-config.tar.gz
libpng-1.2.43rc01-no-config.tar.bz2 libpng-1.2.43rc02-no-config.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
lp1243r01.zip lp1243r02.zip
lp1243r01.7z lp1243r02.7z
lp1243r01.tar.bz2 lp1243r02.tar.bz2
Project files Project files
libpng-1.2.43rc01-project-netware.zip libpng-1.2.43rc02-project-netware.zip
libpng-1.2.43rc01-project-wince.zip libpng-1.2.43rc02-project-wince.zip
Other information: Other information:
libpng-1.2.43rc01-README.txt libpng-1.2.43rc02-README.txt
libpng-1.2.43rc01-KNOWNBUGS.txt libpng-1.2.43rc02-KNOWNBUGS.txt
libpng-1.2.43rc01-LICENSE.txt libpng-1.2.43rc02-LICENSE.txt
libpng-1.2.43rc01-Y2K-compliance.txt libpng-1.2.43rc02-Y2K-compliance.txt
libpng-1.2.43rc01-[previous version]-diff.txt libpng-1.2.43rc02-[previous version]-diff.txt
Changes since the last public release (1.2.42): Changes since the last public release (1.2.42):
@ -67,9 +67,12 @@ version 1.2.43beta04 [February 8, 2010]
version 1.2.43beta05 [February 8, 2010] version 1.2.43beta05 [February 8, 2010]
Ported rewritten png_decompress_chunk() by John Bowler from libpng-1.4.1. Ported rewritten png_decompress_chunk() by John Bowler from libpng-1.4.1.
version 1.0.53rc01 and 1.2.43rc01 [February 18, 2010] version 1.0.53rc01 and 1.2.43rc01 [February 20, 2010]
No changes. No changes.
version 1.0.53rc02 and 1.2.43rc02 [February 20, 2010]
Define _ALL_SOURCE in pngconf.h when building with AIX compiler.
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

View File

@ -2672,6 +2672,9 @@ version 1.2.43beta05 [February 8, 2010]
version 1.0.53rc01 and 1.2.43rc01 [February 18, 2010] version 1.0.53rc01 and 1.2.43rc01 [February 18, 2010]
No changes. No changes.
version 1.0.53rc02 and 1.2.43rc02 [February 20, 2010]
Define _ALL_SOURCE in pngconf.h when building with AIX compiler.
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

29
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.2.43rc01. # Generated by GNU Autoconf 2.65 for libpng 1.2.43rc02.
# #
# 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.2.43rc01' PACKAGE_VERSION='1.2.43rc02'
PACKAGE_STRING='libpng 1.2.43rc01' PACKAGE_STRING='libpng 1.2.43rc02'
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
PACKAGE_URL='' PACKAGE_URL=''
@ -1435,7 +1435,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.2.43rc01 to adapt to many kinds of systems. \`configure' configures libpng 1.2.43rc02 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1505,7 +1505,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.2.43rc01:";; short | recursive ) echo "Configuration of libpng 1.2.43rc02:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@ -1612,7 +1612,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.2.43rc01 libpng configure 1.2.43rc02
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.
@ -2037,7 +2037,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.2.43rc01, which was It was created by libpng $as_me 1.2.43rc02, which was
generated by GNU Autoconf 2.65. Invocation command line was generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@ $ $0 $@
@ -2845,7 +2845,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE='libpng' PACKAGE='libpng'
VERSION='1.2.43rc01' VERSION='1.2.43rc02'
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
@ -2909,7 +2909,7 @@ fi
PNGLIB_VERSION=1.2.43rc01 PNGLIB_VERSION=1.2.43rc02
PNGLIB_MAJOR=1 PNGLIB_MAJOR=1
PNGLIB_MINOR=2 PNGLIB_MINOR=2
PNGLIB_RELEASE=43 PNGLIB_RELEASE=43
@ -11420,7 +11420,12 @@ else
fi fi
LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG case $host_os in
aix*)
LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG -D_ALL_SOURCE;;
*)
LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG;;
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if assembler code in pnggccrd.c can be compiled without PNG_NO_MMX_CODE" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if assembler code in pnggccrd.c can be compiled without PNG_NO_MMX_CODE" >&5
$as_echo_n "checking if assembler code in pnggccrd.c can be compiled without PNG_NO_MMX_CODE... " >&6; } $as_echo_n "checking if assembler code in pnggccrd.c can be compiled without PNG_NO_MMX_CODE... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@ -12074,7 +12079,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.2.43rc01, which was This file was extended by libpng $as_me 1.2.43rc02, 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
@ -12140,7 +12145,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.2.43rc01 libpng config.status 1.2.43rc02
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\\"

View File

@ -18,12 +18,12 @@ AC_PREREQ(2.59)
dnl Version number stuff here: dnl Version number stuff here:
AC_INIT([libpng], [1.2.43rc01], [png-mng-implement@lists.sourceforge.net]) AC_INIT([libpng], [1.2.43rc02], [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.2.43rc01 PNGLIB_VERSION=1.2.43rc02
PNGLIB_MAJOR=1 PNGLIB_MAJOR=1
PNGLIB_MINOR=2 PNGLIB_MINOR=2
PNGLIB_RELEASE=43 PNGLIB_RELEASE=43
@ -59,7 +59,12 @@ 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]))
LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG case $host_os in
aix*)
LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG -D_ALL_SOURCE;;
*)
LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG;;
esac
AC_MSG_CHECKING( AC_MSG_CHECKING(
[if assembler code in pnggccrd.c can be compiled without PNG_NO_MMX_CODE]) [if assembler code in pnggccrd.c can be compiled without PNG_NO_MMX_CODE])
AC_TRY_COMPILE( AC_TRY_COMPILE(

View File

@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng /* pngconf.h - machine configurable file for libpng
* *
* libpng version 1.2.43rc01 - February 18, 2010 * libpng version 1.2.43rc02 - February 20, 2010
* Copyright (c) 1998-2010 Glenn Randers-Pehrson * Copyright (c) 1998-2010 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@ -40,6 +40,16 @@
#endif #endif
#endif #endif
/* Added at libpng-1.2.43 */
#if ((defined(_AIX)) && \
(!defined (_XOPEN_SOURCE)) && \
(!defined (_POSIX_SOURCE)) && \
(!defined (_ANSI_C_SOURCE)))
# ifndef _ALL_SOURCE
# define _ALL_SOURCE
# endif
#endif
/* /*
* Added at libpng-1.2.8 * Added at libpng-1.2.8
* *

View File

@ -23,7 +23,7 @@ LN_SF = ln -f -s
LIBNAME=libpng12 LIBNAME=libpng12
PNGMAJ = 0 PNGMAJ = 0
PNGMIN = 1.2.43rc01 PNGMIN = 1.2.43rc02
PNGVER = $(PNGMAJ).$(PNGMIN) PNGVER = $(PNGMAJ).$(PNGMIN)
prefix=/usr/local prefix=/usr/local
@ -48,7 +48,7 @@ LDDEBUG =
CRELEASE = -O2 CRELEASE = -O2
LDRELEASE = -s LDRELEASE = -s
WARNMORE=-W -Wall WARNMORE=-W -Wall
CFLAGS = -I$(ZLIBINC) $(WARNMORE) $(CRELEASE) CFLAGS = -D_ALL_SOURCE -I$(ZLIBINC) $(WARNMORE) $(CRELEASE)
LDFLAGS = -L. -L$(ZLIBLIB) -lpng12 -lz -lm $(LDRELEASE) LDFLAGS = -L. -L$(ZLIBLIB) -lpng12 -lz -lm $(LDRELEASE)
# File extensions # File extensions