From 86a91e2c5782b240054334375afc85a730310929 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 5 Oct 2014 19:38:52 +0200 Subject: [PATCH] package/apr-util: make sqlite optional Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/apr-util/Config.in | 1 - package/apr-util/apr-util.mk | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package/apr-util/Config.in b/package/apr-util/Config.in index f54e85a55..6757e7e21 100644 --- a/package/apr-util/Config.in +++ b/package/apr-util/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_APR_UTIL bool "apr-util" select BR2_PACKAGE_APR - select BR2_PACKAGE_SQLITE select BR2_PACKAGE_EXPAT # apr really needs shared library support depends on !BR2_PREFER_STATIC_LIB diff --git a/package/apr-util/apr-util.mk b/package/apr-util/apr-util.mk index 1b85daed6..6bc6ee922 100644 --- a/package/apr-util/apr-util.mk +++ b/package/apr-util/apr-util.mk @@ -9,7 +9,7 @@ APR_UTIL_SITE = http://archive.apache.org/dist/apr APR_UTIL_LICENSE = Apache-2.0 APR_UTIL_LICENSE_FILES = LICENSE APR_UTIL_INSTALL_STAGING = YES -APR_UTIL_DEPENDENCIES = apr expat sqlite +APR_UTIL_DEPENDENCIES = apr expat APR_UTIL_CONF_OPTS = \ --with-apr=$(STAGING_DIR)/usr/bin/apr-1-config APR_UTIL_CONFIG_SCRIPTS = apu-1-config @@ -18,4 +18,11 @@ APR_UTIL_CONFIG_SCRIPTS = apu-1-config # features. APR_UTIL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) +ifeq ($(BR2_PACKAGE_SQLITE),y) +APR_UTIL_CONF_OPTS += --with-sqlite3="$(STAGING_DIR)/usr" +APR_UTIL_DEPENDENCIES += sqlite +else +APR_UTIL_CONF_OPTS += --without-sqlite3 +endif + $(eval $(autotools-package))