| Andrew Geissler | ac970dd | 2021-02-12 15:32:45 -0600 | [diff] [blame^] | 1 | From 6ffd9db8e02e411bda2f421abf7951dab6cf0e38 Mon Sep 17 00:00:00 2001 |
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Fri, 5 Feb 2021 01:43:44 -0800 |
| 4 | Subject: [PATCH] configure.ac: explicitly link to jpeg lib |
| 5 | |
| 6 | Since oe has added lib jpeg to the depends, explicitly link to jpeg lib |
| 7 | to workaround build failure with autoconf 2.7 |
| 8 | |
| 9 | Upstream-Status: Inappropriate [oe specific] |
| 10 | |
| 11 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 12 | --- |
| 13 | configure.ac | 14 +------------- |
| 14 | 1 file changed, 1 insertion(+), 13 deletions(-) |
| 15 | |
| 16 | diff --git a/configure.ac b/configure.ac |
| 17 | index 1ce81f91..8bbb50de 100644 |
| 18 | --- a/configure.ac |
| 19 | +++ b/configure.ac |
| 20 | @@ -191,24 +191,12 @@ AC_SUBST(SSL_CFLAGS) |
| 21 | AC_SUBST(SSL_LIBS) |
| 22 | AS_VAR_APPEND([SPICE_REQUIRES], [" openssl"]) |
| 23 | |
| 24 | -AC_CHECK_LIB(jpeg, jpeg_destroy_decompress, |
| 25 | - AC_MSG_CHECKING([for jpeglib.h]) |
| 26 | - AC_TRY_CPP( |
| 27 | -[#include <stdio.h> |
| 28 | -#undef PACKAGE |
| 29 | -#undef VERSION |
| 30 | -#undef HAVE_STDLIB_H |
| 31 | -#include <jpeglib.h>], |
| 32 | - JPEG_LIBS='-ljpeg' |
| 33 | - AC_MSG_RESULT($jpeg_ok), |
| 34 | - AC_MSG_ERROR([jpeglib.h not found])), |
| 35 | - AC_MSG_ERROR([libjpeg not found])) |
| 36 | +JPEG_LIBS='-ljpeg' |
| 37 | AC_SUBST(JPEG_LIBS) |
| 38 | |
| 39 | AC_CHECK_LIB(z, deflate, Z_LIBS='-lz', AC_MSG_ERROR([zlib not found])) |
| 40 | AC_SUBST(Z_LIBS) |
| 41 | |
| 42 | - |
| 43 | AC_ARG_ENABLE([manual], |
| 44 | AS_HELP_STRING([--enable-manual=@<:@auto/yes/no@:>@], |
| 45 | [Build SPICE manual]), |
| 46 | -- |
| 47 | 2.29.2 |
| 48 | |