diff options
| author | Po Lu <luangruo@yahoo.com> | 2023-03-09 08:52:54 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2023-03-09 08:53:24 +0800 |
| commit | 7e1012765c40a10a8a051c39566778913dc7e224 (patch) | |
| tree | 34415245ad4180425d899124d97b64560b327c61 /configure.ac | |
| parent | c2ca009da4cc2c81be364a1ddac15e8c7585ddf6 (diff) | |
| download | emacs-7e1012765c40a10a8a051c39566778913dc7e224.tar.gz | |
Fix libwebp check for some webp installations
* configure.ac: Look for WebPGetInfo; if it is not there, look
for libwebpdecoder as well. (bug#61988)
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index bc7e61048c3..ac93d003b70 100644 --- a/configure.ac +++ b/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 |