diff options
| author | Po Lu | 2023-03-09 14:57:45 +0800 |
|---|---|---|
| committer | Po Lu | 2023-03-09 14:57:45 +0800 |
| commit | 745890de5204850bb4173c19ceb79c698acb7a20 (patch) | |
| tree | a72f00e25a765bc05bb8111007da113c3ceafa25 | |
| parent | c99354042a676acf218aa8cda20b3d100240c207 (diff) | |
| download | emacs-745890de5204850bb4173c19ceb79c698acb7a20.tar.gz emacs-745890de5204850bb4173c19ceb79c698acb7a20.zip | |
Fix webp test for Android
* configure.ac (HAVE_WEBP): Disable WebPGetInfo check when
REALLY_ANDROID.
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index a5c8b3cb3a9..328b55d96ec 100644 --- a/configure.ac +++ b/configure.ac | |||
| @@ -3455,12 +3455,13 @@ if test "${with_webp}" != "no"; then | |||
| 3455 | CFLAGS="$CFLAGS $WEBP_CFLAGS" | 3455 | CFLAGS="$CFLAGS $WEBP_CFLAGS" |
| 3456 | LIBS="$LIBS $WEBP_LIBS" | 3456 | LIBS="$LIBS $WEBP_LIBS" |
| 3457 | 3457 | ||
| 3458 | AC_CHECK_FUNC([WebPGetInfo], [], | 3458 | AS_IF([test "$REALLY_ANDROID" != "yes"], [ |
| 3459 | [WEBP_MODULE="$WEBP_MODULE libwebpdecoder >= $WEBP_REQUIRED" | 3459 | AC_CHECK_FUNC([WebPGetInfo], [], |
| 3460 | HAVE_WEBP=no | 3460 | [WEBP_MODULE="$WEBP_MODULE libwebpdecoder >= $WEBP_REQUIRED" |
| 3461 | AS_UNSET([WEBP_LIBS]) | 3461 | HAVE_WEBP=no |
| 3462 | AS_UNSET([WEBP_CFLAGS]) | 3462 | AS_UNSET([WEBP_LIBS]) |
| 3463 | EMACS_CHECK_MODULES([WEBP], [$WEBP_MODULE])]) | 3463 | AS_UNSET([WEBP_CFLAGS]) |
| 3464 | EMACS_CHECK_MODULES([WEBP], [$WEBP_MODULE])])]) | ||
| 3464 | 3465 | ||
| 3465 | CFLAGS=$OLD_CFLAGS | 3466 | CFLAGS=$OLD_CFLAGS |
| 3466 | LIBS=$OLD_LIBS | 3467 | LIBS=$OLD_LIBS |