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

[libpng16] Restored contrib/timepng to default build but check for check for

Browse Source 
presence of clock_gettime() in configure.ac and Makefile.am.
This commit is contained in:
Glenn Randers-Pehrson 2016-05-17 18:35:59 -05:00
parent add4581894
commit d6e5a72c84
4 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ANNOUNCE
View File

@ -1,4 +1,4 @@
Libpng 1.6.22rc02 - May 16, 2016 Libpng 1.6.22rc02 - May 17, 2016
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.
@ -102,9 +102,14 @@ Version 1.6.22beta06 [May 5, 2016]
Version 1.6.22rc01 [May 14, 2016] Version 1.6.22rc01 [May 14, 2016]
No changes. No changes.
Version 1.6.22rc02 [May 16, 2016] Version 1.6.22rc02 [May 17, 2016]
Removed contrib/timepng from default build; it does not build on platforms Removed contrib/timepng from default build; it does not build on platforms
that don't supply clock_gettime(). that don't supply clock_gettime().
Check for CLOCK_PROCESS_CPUTIME_ID when building /contrib/libtests/timepng.
Version 1.6.22rc03 [May 16, 2016]
Restored contrib/timepng to default build but check for check for presence
of clock_gettime() in configure.ac and Makefile.am.
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

4
CHANGES
View File

@ -5566,6 +5566,10 @@ Version 1.6.22rc02 [May 16, 2016]
Removed contrib/timepng from default build; it does not build on platforms Removed contrib/timepng from default build; it does not build on platforms
that don't supply clock_gettime(). that don't supply clock_gettime().
Version 1.6.22rc03 [May 17, 2016]
Restored contrib/timepng to default build but check for check for presence
of clock_gettime() in configure.ac and Makefile.am.
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

7
Makefile.am
View File

@ -13,6 +13,9 @@ ACLOCAL_AMFLAGS = -I scripts
# test programs - run on make check, make distcheck # test programs - run on make check, make distcheck
check_PROGRAMS= pngtest pngunknown pngstest pngvalid pngimage check_PROGRAMS= pngtest pngunknown pngstest pngvalid pngimage
if HAVE_CLOCK_GETTIME
check_PROGRAMS += timepng
endif
# Utilities - installed # Utilities - installed
bin_PROGRAMS= pngfix png-fix-itxt bin_PROGRAMS= pngfix png-fix-itxt
@ -42,6 +45,9 @@ pngunknown_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
pngimage_SOURCES = contrib/libtests/pngimage.c pngimage_SOURCES = contrib/libtests/pngimage.c
pngimage_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la pngimage_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
timepng_SOURCES = contrib/libtests/timepng.c
timepng_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
pngfix_SOURCES = contrib/tools/pngfix.c pngfix_SOURCES = contrib/tools/pngfix.c
pngfix_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la pngfix_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
@ -220,6 +226,7 @@ contrib/libtests/pngimage.o: pnglibconf.h
contrib/libtests/pngvalid.o: pnglibconf.h contrib/libtests/pngvalid.o: pnglibconf.h
contrib/libtests/readpng.o: pnglibconf.h contrib/libtests/readpng.o: pnglibconf.h
contrib/libtests/tarith.o: pnglibconf.h contrib/libtests/tarith.o: pnglibconf.h
contrib/libtests/timepng.o: pnglibconf.h
contrib/tools/makesRGB.o: pnglibconf.h contrib/tools/makesRGB.o: pnglibconf.h
contrib/tools/pngfix.o: pnglibconf.h contrib/tools/pngfix.o: pnglibconf.h

6
configure.ac
View File

@ -146,6 +146,12 @@ AC_C_RESTRICT
AC_FUNC_STRTOD AC_FUNC_STRTOD
AC_CHECK_FUNCS([memset], , AC_MSG_ERROR(memset not found in libc)) AC_CHECK_FUNCS([memset], , AC_MSG_ERROR(memset not found in libc))
AC_CHECK_FUNCS([pow], , AC_CHECK_LIB(m, pow, , AC_MSG_ERROR(cannot find pow)) ) AC_CHECK_FUNCS([pow], , AC_CHECK_LIB(m, pow, , AC_MSG_ERROR(cannot find pow)) )
# Some later POSIX 1003.1 functions are required for test programs, failure here
# is soft (the corresponding test program is not built).
AC_CHECK_FUNC([clock_gettime],,[AC_MSG_WARN([not building timepng])])
AM_CONDITIONAL([HAVE_CLOCK_GETTIME], [test "$ac_cv_func_clock_gettime" = "yes"])
AC_ARG_WITH(zlib-prefix, AC_ARG_WITH(zlib-prefix,
AS_HELP_STRING([[[--with-zlib-prefix]]], AS_HELP_STRING([[[--with-zlib-prefix]]],
[prefix that may have been used in installed zlib]), [prefix that may have been used in installed zlib]),