Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable libcurl test when building wxiOS

Browse Source 
It's not really useful in this case and somehow breaks Travis CI build.
This commit is contained in:
Vadim Zeitlin
2020-12-13 03:18:01 +01:00
parent 59bc7e59d7
commit 0db857a460
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configure vendored
View File

@@ -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=

7
configure.in
View File

@@ -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 ----------------------------------------------------------------