diff options
| author | Gustavo Zacarias <gustavo@zacarias.com.ar> | 2015-01-08 15:18:58 -0300 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-01-08 21:15:34 +0100 |
| commit | 6a570acfca5b1f55f8e00c37e80683eb14eebb38 (patch) | |
| tree | 5b31e74e47e5ec4a6fd0582e2d4348e97d155085 /package/dillo | |
| parent | 6c782df7b828eb09e433d25933b5986f841b7383 (diff) | |
dillo: zlib is a mandatory dependency
Fixes:
http://autobuild.buildroot.net/results/10f/10f7ba386a13753c942139b8bc13ca74d8932f3a/
Also reorder variables a bit and ditch duplicate addition.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/dillo')
| -rw-r--r-- | package/dillo/Config.in | 1 | ||||
| -rw-r--r-- | package/dillo/dillo.mk | 7 |
2 files changed, 3 insertions, 5 deletions
diff --git a/package/dillo/Config.in b/package/dillo/Config.in index 5c2cc6280..d06f2d1f5 100644 --- a/package/dillo/Config.in +++ b/package/dillo/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_DILLO depends on BR2_USE_MMU # fltk fork() select BR2_PACKAGE_FLTK select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE + select BR2_PACKAGE_ZLIB help Dillo is a multi-platform graphical web browser known for its speed and small footprint. diff --git a/package/dillo/dillo.mk b/package/dillo/dillo.mk index c216322a2..9bdd56f75 100644 --- a/package/dillo/dillo.mk +++ b/package/dillo/dillo.mk @@ -11,13 +11,10 @@ DILLO_LICENSE = GPLv3+ DILLO_LICENSE_FILES = COPYING # For 0001-configure.ac-change-fltk-config-test-to-be-more-cros.patch DILLO_AUTORECONF = YES - -DILLO_DEPENDENCIES = fltk - +DILLO_DEPENDENCIES = fltk zlib \ + $(if $(BR2_PACKAGE_LIBICONV),libiconv) DILLO_CONF_ENV = ac_cv_path_FLTK_CONFIG=$(STAGING_DIR)/usr/bin/fltk-config -DILLO_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) - ifeq ($(BR2_PACKAGE_OPENSSL),y) DILLO_CONF_OPTS += --enable-ssl DILLO_DEPENDENCIES += openssl |