diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2018-06-02 11:21:20 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2018-06-02 11:21:20 +0200 |
| commit | 8b0fd3cb49566854fc038213e093e3c325618399 (patch) | |
| tree | 05d6e0ccaef205c9e6f75f22cd37d852058ca664 /package/libcurl/libcurl.mk | |
| parent | ef01260b3d4852e7f1b760c1e0f5073ce342f2c8 (diff) | |
| parent | 243627efbd53241127b6384a47ac89f2d73226e4 (diff) | |
| download | buildroot-8b0fd3cb49566854fc038213e093e3c325618399.tar.gz buildroot-8b0fd3cb49566854fc038213e093e3c325618399.zip | |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/libcurl/libcurl.mk')
| -rw-r--r-- | package/libcurl/libcurl.mk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 25d74394c7..00a213cc3c 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -9,7 +9,6 @@ LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.haxx.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ $(if $(BR2_PACKAGE_ZLIB),zlib) \ - $(if $(BR2_PACKAGE_LIBIDN),libidn) \ $(if $(BR2_PACKAGE_RTMPDUMP),rtmpdump) LIBCURL_LICENSE = curl LIBCURL_LICENSE_FILES = COPYING @@ -70,6 +69,13 @@ else LIBCURL_CONF_OPTS += --disable-ares endif +ifeq ($(BR2_PACKAGE_LIBIDN2),y) +LIBCURL_DEPENDENCIES += libidn2 +LIBCURL_CONF_OPTS += --with-libidn2 +else +LIBCURL_CONF_OPTS += --without-libidn2 +endif + # Configure curl to support libssh2 ifeq ($(BR2_PACKAGE_LIBSSH2),y) LIBCURL_DEPENDENCIES += libssh2 |
