diff options
| author | grant <grant@pkgsrc.org> | 2002-12-22 13:04:39 +0000 |
|---|---|---|
| committer | grant <grant@pkgsrc.org> | 2002-12-22 13:04:39 +0000 |
| commit | 276042c696ab9165c56af0042681807371e751a5 (patch) | |
| tree | 8a38fc6c0e4db4d3128a1ed89474a88113f873cb /www/apache | |
| parent | 3b91c7b547bd7b7980046cd0eae7e2066598635d (diff) | |
| download | pkgsrc-276042c696ab9165c56af0042681807371e751a5.tar.gz | |
Revert to previous behavior and use db1 functions in libc if they are
present, rather than installing databases/db (affects NetBSD, Linux,
Darwin and possibly others).
As suggested by Kimmo Suominen.
Diffstat (limited to 'www/apache')
| -rw-r--r-- | www/apache/Makefile | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/www/apache/Makefile b/www/apache/Makefile index 089d785384a..5dc117fdaaa 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.116 2002/12/19 14:08:34 grant Exp $ +# $NetBSD: Makefile,v 1.117 2002/12/22 13:04:39 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,14 +115,22 @@ LINK_LIBGCC_LDFLAGS= -Wl,--whole-archive -lgcc -Wl,--no-whole-archive MAKE_ENV+= LINK_LIBGCC_LDFLAGS="${LINK_LIBGCC_LDFLAGS}" .endif +# Use operating system's db1 functions (where available) +USE_DB185= # defined + .include "../../databases/db/buildlink2.mk" BUILDLINK_DEPENDS.db= db>=2.7.7 + +.if defined(BUILDLINK_PREFIX.db_DEFAULT) CONFIGURE_ENV+= INCLUDES="${BUILDLINK_CPPFLAGS.db}" -CONFIGURE_ENV+= LIBS="-ldb2" -.if ${OPSYS} == "SunOS" -LDFLAGS+= -Wl,-R/usr/ucblib -L/usr/ucblib +# on Solaris, we also need libdbm +. if ${OPSYS} == "SunOS" CONFIGURE_ENV+= LIBS="-ldbm -ldb2" +LDFLAGS+= -Wl,-R/usr/ucblib -L/usr/ucblib +. else +CONFIGURE_ENV+= LIBS="-ldb2" +. endif .endif BUILD_DEFS+= APACHE_CUSTOM_CFLAGS |