diff options
| author | jlam <jlam@pkgsrc.org> | 2004-11-15 17:54:49 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-11-15 17:54:49 +0000 |
| commit | b67b0725c487d6867521ee52db866b955f29d0fd (patch) | |
| tree | 5579b0ab6b1d842e66a7d3075d37a9f9564a124e /databases/openldap/options.mk | |
| parent | 8f9890fc252ddfbc4e7f77aea28c933fe28c5a81 (diff) | |
| download | pkgsrc-b67b0725c487d6867521ee52db866b955f29d0fd.tar.gz | |
Rework the Berkeley DB detection in buildlink3:
* Add a db1.builtin.mk file that detects whether DB-1.85 functionality
exists in the base system, and remove the distinction between
"native" and the other Berkeley DB packages -- we now refer to
db[1234]. This paves the way for any future databases/db1 package.
* USE_DB185 shouldn't need to be set by any packages -- its correct
value is now automatically determined by bdb.buildlink3.mk depending
on whether we explicitly request db1 or not. By default, if you
include bdb.buildlink3.mk, you want DB-1.85 functionality and
USE_DB185 defaults to "yes", but if you explicitly remove db1 from
the list of acceptable DBs, then USE_DB185 defaults to "no".
* Set BDB_LIBS to the library options needed to link against the DB
library when bdb.buildlink3.mk is included.
* We only add the DB library to the linker command automatically if
we want DB-1.85 functionality; otherwise assume that the package
configure process can figure out how to probe for the correct
headers and libraries.
Edit package Makefiles to nuke redundant settings of USE_DB185.
Diffstat (limited to 'databases/openldap/options.mk')
| -rw-r--r-- | databases/openldap/options.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/databases/openldap/options.mk b/databases/openldap/options.mk index 95a1e40fa41..2c7c2bcb71e 100644 --- a/databases/openldap/options.mk +++ b/databases/openldap/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.6 2004/11/15 00:55:25 tv Exp $ +# $NetBSD: options.mk,v 1.7 2004/11/15 17:54:49 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.openldap PKG_SUPPORTED_OPTIONS= bdb dynamic kerberos sasl slp @@ -10,7 +10,6 @@ PKG_DEFAULT_OPTIONS+= bdb ### Whether to build with the Berkeley DB based slapd backends. ### .if !empty(PKG_OPTIONS:Mbdb) -USE_DB185= no BDB_ACCEPTED= db4 # db3? . include "../../mk/bdb.buildlink3.mk" CONFIGURE_ARGS+= --enable-bdb --enable-hdb |