Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From cee80af1fe93f5b76765afeebfcc3b902768f5d6 Mon Sep 17 00:00:00 2001 |
| 2 | From: Andre McCurdy <armccurdy@gmail.com> |
| 3 | Date: Tue, 26 May 2015 21:41:24 -0700 |
| 4 | Subject: [PATCH] use pkg-config to locate zlib |
| 5 | |
| 6 | AC_LIB_HAVE_LINKFLAGS can sometimes find host libs and is therefore not |
| 7 | robust when cross-compiling. Remove it for zlib and use PKG_CHECK_MODULES |
| 8 | instead. |
| 9 | |
| 10 | Removing AC_LIB_HAVE_LINKFLAGS for zlib also removes the --with-libz-prefix |
| 11 | configure option. If zlib support is enabled, then failure to find zlib via |
| 12 | pkg-config is now treated as a fatal error. |
| 13 | |
| 14 | Change based on ChromeOS gnutls 2.12.23 cross-compile fixes patch: |
| 15 | |
| 16 | https://chromium-review.googlesource.com/#/c/271661/ |
| 17 | |
| 18 | Upstream-Status: Inappropriate [configuration] |
| 19 | |
| 20 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> |
| 21 | --- |
| 22 | configure.ac | 24 ++++++++++-------------- |
| 23 | 1 file changed, 10 insertions(+), 14 deletions(-) |
| 24 | |
| 25 | diff --git a/configure.ac b/configure.ac |
| 26 | index 1b561d5..0c787dc 100644 |
| 27 | --- a/configure.ac |
| 28 | +++ b/configure.ac |
| 29 | @@ -508,25 +508,21 @@ AC_ARG_WITH(zlib, AS_HELP_STRING([--without-zlib], |
| 30 | AC_MSG_CHECKING([whether to include zlib compression support]) |
| 31 | if test x$ac_zlib != xno; then |
| 32 | AC_MSG_RESULT(yes) |
| 33 | - AC_LIB_HAVE_LINKFLAGS(z,, [#include <zlib.h>], [compress (0, 0, 0, 0);]) |
| 34 | - if test x$ac_cv_libz != xyes; then |
| 35 | - AC_MSG_WARN( |
| 36 | -*** |
| 37 | -*** ZLIB was not found. You will not be able to use ZLIB compression.) |
| 38 | - fi |
| 39 | else |
| 40 | AC_MSG_RESULT(no) |
| 41 | fi |
| 42 | |
| 43 | -PKG_CHECK_EXISTS(zlib, ZLIB_HAS_PKGCONFIG=y, ZLIB_HAS_PKGCONFIG=n) |
| 44 | - |
| 45 | if test x$ac_zlib != xno; then |
| 46 | - if test "$ZLIB_HAS_PKGCONFIG" = "y" ; then |
| 47 | - if test "x$GNUTLS_REQUIRES_PRIVATE" = x; then |
| 48 | - GNUTLS_REQUIRES_PRIVATE="Requires.private: zlib" |
| 49 | - else |
| 50 | - GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE, zlib" |
| 51 | - fi |
| 52 | + PKG_CHECK_MODULES(ZLIB, zlib) |
| 53 | + HAVE_LIBZ=yes |
| 54 | + AC_DEFINE([HAVE_LIBZ], [1], [zlib is enabled]) |
| 55 | + AC_SUBST(HAVE_LIBZ) |
| 56 | + LTLIBZ=$ZLIB_LIBS |
| 57 | + AC_SUBST(LTLIBZ) |
| 58 | + if test "x$GNUTLS_REQUIRES_PRIVATE" = x; then |
| 59 | + GNUTLS_REQUIRES_PRIVATE="Requires.private: zlib" |
| 60 | + else |
| 61 | + GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE, zlib" |
| 62 | fi |
| 63 | fi |
| 64 | AC_SUBST(GNUTLS_REQUIRES_PRIVATE) |
| 65 | -- |
| 66 | 1.9.1 |
| 67 | |