sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

allow spng.pc and libspng.ps for libspng discovery

Browse Source
This commit is contained in:
John Cupitt 2020-12-14 10:24:25 +00:00
parent 1b19e6f832
commit ff3c4acbb2
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure.ac
View File

@ -1126,6 +1126,7 @@ FIND_GIFLIB(
) )
# Look for libspng first # Look for libspng first
# 0.6.1 uses "libspng.pc", git master libspng uses "spng.pc"
AC_ARG_WITH([libspng], AC_ARG_WITH([libspng],
AS_HELP_STRING([--without-libspng], [build without libspng (default: test)])) AS_HELP_STRING([--without-libspng], [build without libspng (default: test)]))
@ -1133,14 +1134,23 @@ if test x"$with_libspng" != x"no"; then
PKG_CHECK_MODULES(SPNG, libspng >= 0.6, PKG_CHECK_MODULES(SPNG, libspng >= 0.6,
[AC_DEFINE(HAVE_SPNG,1,[define if you have libspng installed.]) [AC_DEFINE(HAVE_SPNG,1,[define if you have libspng installed.])
with_libspng=yes with_libspng=yes
PACKAGES_USED="$PACKAGES_USED spng" PACKAGES_USED="$PACKAGES_USED libspng"
], ],
[with_libspng=no [PKG_CHECK_MODULES(SPNG, spng >= 0.6,
[AC_DEFINE(HAVE_SPNG,1,[define if you have libspng installed.])
with_libspng=yes
PACKAGES_USED="$PACKAGES_USED spng"
],
[with_libspng=no
]
)
] ]
) )
fi fi
# look for PNG with pkg-config ... fall back to our tester # look for PNG with pkg-config ... fall back to our tester
# we can have both PNG and SPNG enabled, with SPNG for read and PNG for
# write
AC_ARG_WITH([png], AC_ARG_WITH([png],
AS_HELP_STRING([--without-png], [build without libpng (default: test)])) AS_HELP_STRING([--without-png], [build without libpng (default: test)]))