Mon Oct 6 14:31:33 2014 UTC ()
db4 hack is no longer needed


(adam)
diff -r1.17 -r1.18 pkgsrc/databases/openldap-server/options.mk
cvs diff -r1.17 -r1.18 pkgsrc/databases/openldap-server/options.mk (expand / switch to unified diff)

--- pkgsrc/databases/openldap-server/options.mk 2013/05/04 18:16:37 1.17
+++ pkgsrc/databases/openldap-server/options.mk 2014/10/06 14:31:33 1.18
@@ -1,43 +1,35 @@ @@ -1,43 +1,35 @@
1# $NetBSD: options.mk,v 1.17 2013/05/04 18:16:37 adam Exp $ 1# $NetBSD: options.mk,v 1.18 2014/10/06 14:31:33 adam Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.openldap-server 3PKG_OPTIONS_VAR= PKG_OPTIONS.openldap-server
4PKG_SUPPORTED_OPTIONS= bdb dso inet6 sasl slapi slp smbk5pwd 4PKG_SUPPORTED_OPTIONS= bdb dso inet6 sasl slapi slp smbk5pwd
5PKG_OPTIONS_OPTIONAL_GROUPS+= odbc 5PKG_OPTIONS_OPTIONAL_GROUPS+= odbc
6PKG_OPTIONS_GROUP.odbc= iodbc unixodbc 6PKG_OPTIONS_GROUP.odbc= iodbc unixodbc
7PKG_SUGGESTED_OPTIONS= bdb inet6 7PKG_SUGGESTED_OPTIONS= bdb inet6
8 8
9.include "../../mk/bsd.options.mk" 9.include "../../mk/bsd.options.mk"
10 10
11PLIST_VARS+= slapi 11PLIST_VARS+= slapi
12 12
13### 13###
14### Whether to build with the Berkeley DB based slapd backends. 14### Whether to build with the Berkeley DB based slapd backends.
15### 15###
16### NOTE: that option is enabled, because the openldap server needs 16### NOTE: that option is enabled, because the openldap server needs
17### to have local storage support to work as standalone. 17### to have local storage support to work as standalone.
18### 18###
19.if !empty(PKG_OPTIONS:Mbdb) 19.if !empty(PKG_OPTIONS:Mbdb)
20BDB_ACCEPTED= db4 db5 20BDB_ACCEPTED= db4 db5
21CONFIGURE_ARGS+= --enable-bdb --enable-hdb 21CONFIGURE_ARGS+= --enable-bdb --enable-hdb
22TEST_TARGET= test 22TEST_TARGET= test
23# Fix hard-coded support for db4. 
24# Remove if fixed in future versions of OpenLDAP. 
25SUBST_CLASSES= bdb 
26SUBST_MESSAGE.bdb= Fixing bdb library. 
27SUBST_STAGE.bdb= pre-configure 
28SUBST_FILES.bdb= ${WRKSRC}/configure 
29SUBST_SED.bdb= -e 's,-ldb4,-l${BDB_TYPE},g' 
30SUBST_SED.bdb+= -e 's,ol_cv_bdb_major = 4,ol_cv_bdb_major > 3,g' 
31. include "../../mk/bdb.buildlink3.mk" 23. include "../../mk/bdb.buildlink3.mk"
32.else 24.else
33CONFIGURE_ARGS+= --disable-bdb --disable-hdb 25CONFIGURE_ARGS+= --disable-bdb --disable-hdb
34.endif 26.endif
35 27
36### 28###
37### Whether to build with iODBC to enable SQL based slapd backends 29### Whether to build with iODBC to enable SQL based slapd backends
38### 30###
39.if !empty(PKG_OPTIONS:Miodbc) 31.if !empty(PKG_OPTIONS:Miodbc)
40. include "../../databases/iodbc/buildlink3.mk" 32. include "../../databases/iodbc/buildlink3.mk"
41CONFIGURE_ARGS+= --enable-sql 33CONFIGURE_ARGS+= --enable-sql
42.endif 34.endif
43 35