Skip to content
This repository was archived by the owner on Jan 30, 2023. It is now read-only.

Commit ba7d963

Browse files
committed
do not try to recongnise libpng without pkg-config
1 parent 2d4a1cd commit ba7d963

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed
Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,8 @@
11
SAGE_SPKG_CONFIGURE([libpng], [
22
m4_pushdef([SAGE_LIBPNG_MINVER],[1.2])
33
SAGE_SPKG_DEPCHECK([zlib], [
4-
dnl First try checking for libpng with pkg-config
5-
PKG_CHECK_MODULES([LIBPNG], [libpng >= $SAGE_LIBPNG_MINVER], [], [
6-
dnl Fallback to manually grubbing around for headers and libs
7-
AC_CHECK_HEADERS([png.h], [
8-
AC_SEARCH_LIBS([png_get_io_ptr], [png], [
9-
dnl write out libpng.pc
10-
], [sage_spkg_install_libpng=yes])
11-
], [sage_spkg_install_libpng=yes])
12-
])
4+
PKG_CHECK_MODULES([LIBPNG], [libpng >= $SAGE_LIBPNG_MINVER], [
5+
], [sage_spkg_install_libpng=yes])
136
])
147
m4_popdef([SAGE_LIBPNG_MINVER])
158
])

0 commit comments

Comments
 (0)