aboutsummaryrefslogtreecommitdiff
path: root/package/apr-util
diff options
context:
space:
mode:
authorGravatar Bernd Kuhls <bernd.kuhls@t-online.de>2014-10-05 19:38:52 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-10-26 22:19:11 +0100
commit86a91e2c5782b240054334375afc85a730310929 (patch)
tree12b3a73cc23a45558f5cdf596433084ee33f7d00 /package/apr-util
parenta45e0d50ac8c1660a04d699c7caa59d43fdb0160 (diff)
downloadbuildroot-86a91e2c5782b240054334375afc85a730310929.tar.gz
buildroot-86a91e2c5782b240054334375afc85a730310929.tar.bz2
package/apr-util: make sqlite optional
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/apr-util')
-rw-r--r--package/apr-util/Config.in1
-rw-r--r--package/apr-util/apr-util.mk9
2 files changed, 8 insertions, 2 deletions
diff --git a/package/apr-util/Config.in b/package/apr-util/Config.in
index f54e85a550..6757e7e21f 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 1b85daed66..6bc6ee922a 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))