Disable libcurl test when building wxiOS
It's not really useful in this case and somehow breaks Travis CI build.
This commit is contained in:
3
configure
vendored
3
configure
vendored
@@ -23004,6 +23004,8 @@ if test "$wxUSE_LIBMSPACK" != "no"; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
if test "$wxUSE_OSX_IPHONE" != 1; then
|
||||||
|
|
||||||
if test "$wxUSE_LIBCURL" != "no"; then
|
if test "$wxUSE_LIBCURL" != "no"; then
|
||||||
|
|
||||||
pkg_failed=no
|
pkg_failed=no
|
||||||
@@ -23099,6 +23101,7 @@ $as_echo "$as_me: WARNING: libcurl not found, wxWebRequest won't be available" >
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
TOOLKIT=
|
TOOLKIT=
|
||||||
TOOLKIT_INCLUDE=
|
TOOLKIT_INCLUDE=
|
||||||
|
@@ -2928,6 +2928,11 @@ dnl ------------------------------------------------------------------------
|
|||||||
dnl Check for libcurl
|
dnl Check for libcurl
|
||||||
dnl ------------------------------------------------------------------------
|
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
|
if test "$wxUSE_LIBCURL" != "no"; then
|
||||||
PKG_CHECK_MODULES(LIBCURL, [libcurl],
|
PKG_CHECK_MODULES(LIBCURL, [libcurl],
|
||||||
[
|
[
|
||||||
@@ -2952,6 +2957,8 @@ if test "$wxUSE_LIBCURL" != "no"; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
fi dnl wxUSE_OSX_IPHONE != 1
|
||||||
|
|
||||||
dnl ----------------------------------------------------------------
|
dnl ----------------------------------------------------------------
|
||||||
dnl search for toolkit (widget sets)
|
dnl search for toolkit (widget sets)
|
||||||
dnl ----------------------------------------------------------------
|
dnl ----------------------------------------------------------------
|
||||||
|
Reference in New Issue
Block a user