solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Don't use system libcurl under Mac with --disable-sys-libs

Browse source 
It doesn't seem right that the system zlib (installed by e.g. MacPorts)
can be picked up by configure even when --disable-sys-libs is specified,
so disable its use under Mac, as libcurl is optional there.

Still use the system libcurl under Linux in the same case, however, as
it's required to have wxWebRequest at all there and dependency on it is
not really a problem in practice.

This commit is best viewed with Git --color-moved
--color-moved-ws=ignore-all-space -w options.
This commit is contained in:
Vadim Zeitlin 2022-07-24 19:18:24 +02:00
parent 57bf9c5af5
commit 6ed6d97bfe
2 changed files with 40 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

35
configure.in
View file

@ -3001,18 +3001,31 @@ dnl ------------------------------------------------------------------------
dnl Check for libcurl
dnl ------------------------------------------------------------------------
if test "$wxUSE_WEBREQUEST" = "yes" -a "$wxUSE_LIBCURL" != "no"; then
PKG_CHECK_MODULES(LIBCURL, [libcurl],
[
wxUSE_LIBCURL=yes
CXXFLAGS="$LIBCURL_CFLAGS $CXXFLAGS"
LIBS="$LIBCURL_LIBS $LIBS"
],
[
if test "$wxUSE_WEBREQUEST" = "yes"; then
if test "$wxUSE_LIBCURL" = "builtin"; then
dnl When using --disable-sys-libs, we typically want to disable
dnl dependencies on the libraries that are not part of "the
dnl platform" and under macOS libcurl is definitely not part of the
dnl system -- but under Linux it arguably is, so handle this case
dnl appropriately.
if test "$USE_DARWIN" = 1; then
wxUSE_LIBCURL=no
AC_MSG_RESULT([not found])
]
)
fi
fi
if test "$wxUSE_LIBCURL" != "no"; then
PKG_CHECK_MODULES(LIBCURL, [libcurl],
[
wxUSE_LIBCURL=yes
CXXFLAGS="$LIBCURL_CFLAGS $CXXFLAGS"
LIBS="$LIBCURL_LIBS $LIBS"
],
[
wxUSE_LIBCURL=no
AC_MSG_RESULT([not found])
]
)
fi
fi
dnl ----------------------------------------------------------------