From a00fc22779983440d0bec2b996b55f4064079e55 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 24 Mar 2013 08:19:28 +0000 Subject: apr-util: various improvements This commit: * Adds licensing informations. * Uses the apr-1-config script instead of pointing apr-util to the apr build directory. * Ensures apu-1-config gets fixed properly using the _CONFIG_SCRIPTS mechanism. * Ensures that libiconv gets built before apr-util if available, so that character set conversion features of apr-util can be enabled. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/apr-util/apr-util.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/package/apr-util/apr-util.mk b/package/apr-util/apr-util.mk index b9ff904c7..94b181724 100644 --- a/package/apr-util/apr-util.mk +++ b/package/apr-util/apr-util.mk @@ -5,9 +5,16 @@ ############################################################# APR_UTIL_VERSION = 1.4.1 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 sqlite neon zlib APR_UTIL_CONF_OPT = \ - --with-apr=$(BUILD_DIR)/apr-$(APR_VERSION) \ + --with-apr=$(STAGING_DIR)/usr/bin/apr-1-config +APR_UTIL_CONFIG_SCRIPTS = apu-1-config + +# When iconv is available, then use it to provide charset conversion +# features. +APR_UTIL_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) $(eval $(autotools-package)) -- cgit v1.2.3