From 0db857a460b56c6c98ca3b02d6f749bea8ab7e78 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 13 Dec 2020 03:18:01 +0100 Subject: [PATCH] Disable libcurl test when building wxiOS It's not really useful in this case and somehow breaks Travis CI build. --- configure | 3 +++ configure.in | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/configure b/configure index a4a69b02a6..ec0f4072ff 100755 --- a/configure +++ b/configure @@ -23004,6 +23004,8 @@ if test "$wxUSE_LIBMSPACK" != "no"; then fi +if test "$wxUSE_OSX_IPHONE" != 1; then + if test "$wxUSE_LIBCURL" != "no"; then pkg_failed=no @@ -23099,6 +23101,7 @@ $as_echo "$as_me: WARNING: libcurl not found, wxWebRequest won't be available" > fi fi +fi TOOLKIT= TOOLKIT_INCLUDE= diff --git a/configure.in b/configure.in index c898b2e283..c8c37a34d7 100644 --- a/configure.in +++ b/configure.in @@ -2928,6 +2928,11 @@ dnl ------------------------------------------------------------------------ dnl Check for libcurl dnl ------------------------------------------------------------------------ +dnl Using libcurl on iOS doesn't make much sense and currently breaks the +dnl build, probably because it finds a wrong (native) libcurl.pc file, so just +dnl disable it for now. +if test "$wxUSE_OSX_IPHONE" != 1; then + if test "$wxUSE_LIBCURL" != "no"; then PKG_CHECK_MODULES(LIBCURL, [libcurl], [ @@ -2952,6 +2957,8 @@ if test "$wxUSE_LIBCURL" != "no"; then fi fi +fi dnl wxUSE_OSX_IPHONE != 1 + dnl ---------------------------------------------------------------- dnl search for toolkit (widget sets) dnl ----------------------------------------------------------------