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

Commit 168de8b

Browse files
committed
use macro for deps, unconditionally do AC_SUBSTs
AC_SUBSTs should be done in the correct block, even if the main body of the macro is skipped.
1 parent 5119f82 commit 168de8b

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

build/pkgs/freetype/spkg-configure.m4

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
SAGE_SPKG_CONFIGURE([freetype], [
2-
AC_REQUIRE([SAGE_SPKG_CONFIGURE_LIBPNG])
3-
AC_MSG_CHECKING([Installing libpng? ])
4-
if test x$sage_spkg_install_libpng = xyes; then
5-
AC_MSG_RESULT([yes; install freetype as well])
6-
sage_spkg_install_freetype=yes
7-
else
8-
AC_MSG_RESULT([no])
2+
SAGE_SPKG_DEPCHECK([libpng], [
93
dnl freetype versions are libtool's ones, cf trac #30014
104
PKG_CHECK_MODULES([FREETYPE], [freetype2 >= 16.1], [], [sage_spkg_install_freetype=yes])
11-
fi
5+
])
6+
], [], [], [
127
if test x$sage_spkg_install_freetype = xyes; then
138
AC_SUBST(SAGE_FREETYPE_PREFIX, ['$SAGE_LOCAL'])
149
else

0 commit comments

Comments
 (0)