summaryrefslogtreecommitdiff
path: root/devel/apr
diff options
context:
space:
mode:
authorepg <epg@pkgsrc.org>2003-12-03 14:57:05 +0000
committerepg <epg@pkgsrc.org>2003-12-03 14:57:05 +0000
commit3da06317a5d97a23ea0788e3589d7f227e7d27de (patch)
treea48ad0491a59cea21780b7b8736d16782b15573d /devel/apr
parent607a5119e31ae0099a921ce7ad978ed2e0fbfff2 (diff)
downloadpkgsrc-3da06317a5d97a23ea0788e3589d7f227e7d27de.tar.gz
Link to db4.
Diffstat (limited to 'devel/apr')
-rw-r--r--devel/apr/Makefile7
-rw-r--r--devel/apr/buildlink2.mk3
2 files changed, 6 insertions, 4 deletions
diff --git a/devel/apr/Makefile b/devel/apr/Makefile
index 3b18413e9ec..c0206ec362b 100644
--- a/devel/apr/Makefile
+++ b/devel/apr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/11/28 10:01:10 junyoung Exp $
+# $NetBSD: Makefile,v 1.8 2003/12/03 14:57:05 epg Exp $
PKGNAME= apr-${APR_VERSION}.${APACHE_VERSION}
CATEGORIES= devel
@@ -17,7 +17,7 @@ LIBTOOL_OVERRIDE= ${WRKSRC}/apr/libtool
WRKSRC= ${WRKDIR}/${DISTNAME}/srclib
BUILD_DIRS= ${WRKSRC}/apr ${WRKSRC}/apr-util
-CONFIGURE_ENV+= CFLAGS="${CFLAGS}"
+CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LIBS="${LDFLAGS}"
pre-configure:
.for f in apr/config.layout apr-util/config.layout
@@ -34,7 +34,7 @@ do-configure:
@cd ${WRKSRC}/apr-util && ${SETENV} ${CONFIGURE_ENV} ./configure \
--prefix=${PREFIX} \
--with-apr=${WRKSRC}/apr \
- --with-dbm=sdbm \
+ --with-berkeley-db=${BUILDLINK_PREFIX.db4}/include:${LOCALBASE} \
--with-expat=${BUILDLINK_PREFIX.expat}
post-install:
@@ -43,5 +43,6 @@ post-install:
.include "../../www/apache2/Makefile.common"
+.include "../../databases/db4/buildlink2.mk"
.include "../../textproc/expat/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/apr/buildlink2.mk b/devel/apr/buildlink2.mk
index bfb32d94622..77907fc2b89 100644
--- a/devel/apr/buildlink2.mk
+++ b/devel/apr/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/07/09 08:09:04 itojun Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/12/03 14:57:05 epg Exp $
#
.if !defined(APR_BUILDLINK2_MK)
@@ -19,6 +19,7 @@ BUILDLINK_FILES.apr+= lib/aprutil.exp
BUILDLINK_FILES.apr+= lib/libapr-0.*
BUILDLINK_FILES.apr+= lib/libaprutil-0.*
+.include "../../databases/db4/buildlink2.mk"
.include "../../textproc/expat/buildlink2.mk"
BUILDLINK_TARGETS+= apr-buildlink