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

Commit 0ac76c3

Browse files
author
Matthias Koeppe
committed
build/pkgs/libpng/spkg-configure.m4: Do not find libpng and then keep it a secret
1 parent 50c5ac8 commit 0ac76c3

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

build/pkgs/libpng/spkg-configure.m4

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,13 @@ SAGE_SPKG_CONFIGURE([libpng], [
88
AC_MSG_RESULT([no])
99
dnl First try checking for libpng with pkg-config
1010
PKG_CHECK_MODULES([LIBPNG], [libpng >= 1.2], [], [
11-
dnl Fallback to manually grubbing around for headers and libs
12-
AC_CHECK_HEADERS([png.h], [break], [sage_spkg_install_libpng=yes])
13-
AC_SEARCH_LIBS([png_get_io_ptr], [png], [], [sage_spkg_install_libpng=yes])
11+
sage_spkg_install_libpng=yes
12+
dnl Yes, we *could* fallback to manually grubbing around for headers and libs as follows:
13+
dnl AC_CHECK_HEADERS([png.h], [break], [sage_spkg_install_libpng=yes])
14+
dnl AC_SEARCH_LIBS([png_get_io_ptr], [png], [], [sage_spkg_install_libpng=yes])
15+
dnl But 'matplotlib' and 'sagelib' rely on pkg-config to locate libpng.
16+
dnl So we would have to tell them about the libpng that we found,
17+
dnl for example by creating a facade .pc file like we do for BLAS.
1418
])
1519
fi
1620
])

0 commit comments

Comments
 (0)