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>

diff --git a/package/apr-util/Config.in b/package/apr-util/Config.in
index f54e85a550df55e8383a74e3f33fbeb03049a05d..6757e7e21f1df13046f82712626d2a60cd088149 100644 (file)
--- 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 1b85daed6644e504fb0aff88ca9ec5b7d741ef00..6bc6ee922ac45a5639ae9484c3d8f82bdcb5632e 100644 (file)
--- 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))