diff options
| author | epg <epg@pkgsrc.org> | 2004-01-18 18:55:24 +0000 |
|---|---|---|
| committer | epg <epg@pkgsrc.org> | 2004-01-18 18:55:24 +0000 |
| commit | d645297349dd1047acd95f62593246a3d1b6220c (patch) | |
| tree | db6da28fc4b641a4e1566bb47bf70d76df0f4710 /devel | |
| parent | ecc3bc213e5821be8b9db97d36783c552a211938 (diff) | |
| download | pkgsrc-d645297349dd1047acd95f62593246a3d1b6220c.tar.gz | |
As i described in <9883.1074028467@gould.diplodocus.org>
(http://mail-index.netbsd.org/tech-pkg/2004/01/13/0015.html) and
<479.1074093881@gould.diplodocus.org>
(http://mail-index.netbsd.org/tech-pkg/2004/01/14/0016.html), add an
APR_USE_DB4 variable (defaulting to YES except on platforms where db4
is broken).
devel/apr now builds without db4 when APR_USE_DB4 is NO.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/apr/Makefile | 27 | ||||
| -rw-r--r-- | devel/apr/buildlink2.mk | 7 |
2 files changed, 28 insertions, 6 deletions
diff --git a/devel/apr/Makefile b/devel/apr/Makefile index 41910b5746c..9950f14b63a 100644 --- a/devel/apr/Makefile +++ b/devel/apr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/01/13 10:09:18 jklos Exp $ +# $NetBSD: Makefile,v 1.11 2004/01/18 18:55:24 epg Exp $ PKGNAME= apr-${APR_VERSION}.${APACHE_VERSION} PKGREVISION= 1 @@ -27,22 +27,39 @@ pre-configure: .endfor .undef f -do-configure: - @cd ${WRKSRC}/apr && ${SETENV} ${CONFIGURE_ENV} ./configure \ +APR_CONFIGURE_ARGS= \ --prefix=${PREFIX} \ --with-devrandom=/dev/urandom \ --with-installbuilddir=${PREFIX}/libexec/apr - @cd ${WRKSRC}/apr-util && ${SETENV} ${CONFIGURE_ENV} ./configure \ + +APU_CONFIGURE_ARGS= \ --prefix=${PREFIX} \ --with-apr=${WRKSRC}/apr \ - --with-dbm=sdbm \ --with-expat=${BUILDLINK_PREFIX.expat} +.include "../../mk/bsd.prefs.mk" +.if ${APR_USE_DB4} == "YES" +APU_CONFIGURE_ARGS+=\ + --with-berkeley-db=${BUILDLINK_PREFIX.db4}/include:${LOCALBASE} +.else +APU_CONFIGURE_ARGS+= --with-dbm=sdbm +.endif + +do-configure: + @cd ${WRKSRC}/apr && ${SETENV} ${CONFIGURE_ENV} ./configure \ + ${APR_CONFIGURE_ARGS} + @cd ${WRKSRC}/apr-util && ${SETENV} ${CONFIGURE_ENV} ./configure \ + ${APU_CONFIGURE_ARGS} + post-install: ${RM} ${PREFIX}/libexec/apr/libtool ${INSTALL_SCRIPT} ${LIBTOOL} ${PREFIX}/libexec/apr/libtool .include "../../www/apache2/Makefile.common" +.if ${APR_USE_DB4} == "YES" +.include "../../databases/db4/buildlink2.mk" +.endif + .include "../../textproc/expat/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/apr/buildlink2.mk b/devel/apr/buildlink2.mk index ca1bf4fe1f6..c19a71d7004 100644 --- a/devel/apr/buildlink2.mk +++ b/devel/apr/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.6 2004/01/13 10:09:32 jklos Exp $ +# $NetBSD: buildlink2.mk,v 1.7 2004/01/18 18:55:24 epg Exp $ # .if !defined(APR_BUILDLINK2_MK) @@ -19,6 +19,11 @@ BUILDLINK_FILES.apr+= lib/aprutil.exp BUILDLINK_FILES.apr+= lib/libapr-0.* BUILDLINK_FILES.apr+= lib/libaprutil-0.* +.include "../../mk/bsd.prefs.mk" +.if ${APR_USE_DB4} == "YES" +.include "../../databases/db4/buildlink2.mk" +.endif + .include "../../textproc/expat/buildlink2.mk" BUILDLINK_TARGETS+= apr-buildlink |