Fix libwebp check for some webp installations
* configure.ac: Look for WebPGetInfo; if it is not there, look for libwebpdecoder as well. (bug#61988)
This commit is contained in:
parent
c2ca009da4
commit
7e1012765c
1 changed files with 19 additions and 0 deletions
19
configure.ac
19
configure.ac
|
@ -2806,6 +2806,25 @@ if test "${with_webp}" != "no"; then
|
|||
WEBP_MODULE="libwebpdemux >= $WEBP_REQUIRED"
|
||||
|
||||
EMACS_CHECK_MODULES([WEBP], [$WEBP_MODULE])
|
||||
|
||||
# WebPGetInfo is sometimes not present inside libwebpdemux, so
|
||||
# if it does not link, also check for libwebpdecoder.
|
||||
|
||||
OLD_CFLAGS=$CFLAGS
|
||||
OLD_LIBS=$LIBS
|
||||
CFLAGS="$CFLAGS $WEBP_CFLAGS"
|
||||
LIBS="$LIBS $WEBP_LIBS"
|
||||
|
||||
AC_CHECK_FUNC([WebPGetInfo], [],
|
||||
[WEBP_MODULE="$WEBP_MODULE libwebpdecoder >= $WEBP_REQUIRED"
|
||||
HAVE_WEBP=no
|
||||
AS_UNSET([WEBP_LIBS])
|
||||
AS_UNSET([WEBP_CFLAGS])
|
||||
EMACS_CHECK_MODULES([WEBP], [$WEBP_MODULE])])
|
||||
|
||||
CFLAGS=$OLD_CFLAGS
|
||||
LIBS=$OLD_LIBS
|
||||
|
||||
AC_SUBST([WEBP_CFLAGS])
|
||||
AC_SUBST([WEBP_LIBS])
|
||||
fi
|
||||
|
|
Loading…
Add table
Reference in a new issue