From 6aa7532505d6db002a2d2fc33ebc881d3c4e1bb7 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 1 Aug 2010 16:43:53 +0200
Subject: disable global ipv6 configuration symbol, use flavours instead

---
 package/apr/Makefile | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'package/apr/Makefile')

diff --git a/package/apr/Makefile b/package/apr/Makefile
index 4f65c5eef..7da0bf8b5 100644
--- a/package/apr/Makefile
+++ b/package/apr/Makefile
@@ -13,6 +13,9 @@ PKG_DEPENDS:=		libpthread
 PKG_URL:=		http://apr.apache.org
 PKG_SITES:=		http://gd.tuwien.ac.at/infosys/servers/http/apache/dist/${PKG_NAME}/
 
+PKG_FLAVOURS:=		WITH_IPV6
+PKGFD_WITH_IPV6:=	enable IPv6 support
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,APR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -25,8 +28,15 @@ CONFIGURE_ENV+=		ac_cv_file__dev_zero=yes
 CONFIGURE_ENV+=		apr_cv_process_shared_works=no
 CONFIGURE_ENV+=		ac_cv_lib_nsl_gethostbyname=no
 CONFIGURE_ENV+=		apr_cv_tcp_nodelay_with_cork=no
-CONFIGURE_ARGS+=	--with-devrandom=/dev/urandom
-CONFIGURE_ARGS+=	--enable-threads
+
+CONFIGURE_ARGS+=	--with-devrandom=/dev/urandom \
+			--enable-threads
+
+ifneq (${ADK_PACKAGE_LIBPCAP_WITH_IPV6},)
+CONFIGURE_ARGS+=	--enable-ipv6
+else
+CONFIGURE_ARGS+=	--disable-ipv6
+endif
 
 post-install:
 	${INSTALL_DIR} ${IDIR_APR}/usr/lib
-- 
cgit v1.2.3