diff options
author | grant <grant> | 2002-12-19 14:08:34 +0000 |
---|---|---|
committer | grant <grant> | 2002-12-19 14:08:34 +0000 |
commit | 33984e76d25265f88d28e1b2e40fad03a6a17202 (patch) | |
tree | 21a9be4a2c86db7d31738399b2ec3796253e7e14 | |
parent | 22b5ed4a8db871f29808925bf868c6010a88005b (diff) | |
download | pkgsrc-33984e76d25265f88d28e1b2e40fad03a6a17202.tar.gz |
Tidy up conditional use of databases/db/buildlink2.mk.
Fixes build problem on Solaris.
-rw-r--r-- | www/apache/Makefile | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/www/apache/Makefile b/www/apache/Makefile index 81459c1ab9a..089d785384a 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.115 2002/11/18 10:40:12 tron Exp $ +# $NetBSD: Makefile,v 1.116 2002/12/19 14:08:34 grant Exp $ # # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of # code hooks that allow mod_ssl to be compiled separately later, if desired). @@ -115,12 +115,14 @@ LINK_LIBGCC_LDFLAGS= -Wl,--whole-archive -lgcc -Wl,--no-whole-archive MAKE_ENV+= LINK_LIBGCC_LDFLAGS="${LINK_LIBGCC_LDFLAGS}" .endif -.if (${OPSYS} == "SunOS") -LDFLAGS+= -Wl,-R/usr/ucblib -L/usr/ucblib +.include "../../databases/db/buildlink2.mk" +BUILDLINK_DEPENDS.db= db>=2.7.7 CONFIGURE_ENV+= INCLUDES="${BUILDLINK_CPPFLAGS.db}" +CONFIGURE_ENV+= LIBS="-ldb2" + +.if ${OPSYS} == "SunOS" +LDFLAGS+= -Wl,-R/usr/ucblib -L/usr/ucblib CONFIGURE_ENV+= LIBS="-ldbm -ldb2" -BUILDLINK_DEPENDS.db= db>=2.7.7 -. include "../../databases/db/buildlink2.mk" .endif BUILD_DEFS+= APACHE_CUSTOM_CFLAGS |