Move BDB_ACCEPTED within the {storage,auth}-db options section, where
../../mk/bdb.buildlink3.mk is included.
This commit is contained in:
parent
7b90ae84f4
commit
1d677afdcc
2 changed files with 5 additions and 6 deletions
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.58 2010/06/16 07:56:29 adam Exp $
|
||||
# $NetBSD: Makefile,v 1.59 2010/07/06 00:01:35 schnoebe Exp $
|
||||
|
||||
DISTNAME= jabberd-2.2.10
|
||||
CATEGORIES= chat
|
||||
|
@ -14,7 +14,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
|
|||
|
||||
CONFLICTS= jabberd-[0-9]*
|
||||
|
||||
BDB_ACCEPTED= db4 db5
|
||||
USE_LANGUAGES= c c++
|
||||
USE_LIBTOOL= yes
|
||||
USE_TOOLS+= perl:run
|
||||
|
@ -58,9 +57,8 @@ BINDIR= ${PREFIX}/bin
|
|||
EGDIR= ${PREFIX}/share/examples/jabberd
|
||||
DOCDIR= ${PREFIX}/share/doc/jabberd
|
||||
|
||||
FILES= jabberd.cfg c2s.xml router.xml \
|
||||
router-users.xml router-filter.xml s2s.xml \
|
||||
sm.xml
|
||||
FILES= jabberd.cfg c2s.xml router.xml router-users.xml \
|
||||
router-filter.xml s2s.xml sm.xml
|
||||
DBFILES= db-jd14-2-jd2.sql db-setup.mysql db-setup.pgsql \
|
||||
db-update.mysql db-setup.sqlite db-update.sqlite
|
||||
DOCFILES= README.protocol README UPGRADE ChangeLog
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: options.mk,v 1.24 2010/06/02 13:14:47 adam Exp $
|
||||
# $NetBSD: options.mk,v 1.25 2010/07/06 00:01:35 schnoebe Exp $
|
||||
|
||||
PKG_OPTIONS_VAR= PKG_OPTIONS.jabberd2
|
||||
PKG_OPTIONS_REQUIRED_GROUPS= auth storage sasl mio
|
||||
|
@ -33,6 +33,7 @@ CONFIGURE_ARGS+= --with-sasl=gsasl
|
|||
.endif
|
||||
|
||||
.if !empty(PKG_OPTIONS:Mauth-db) || !empty(PKG_OPTIONS:Mstorage-db)
|
||||
BDB_ACCEPTED= db4 db5
|
||||
CONFIGURE_ARGS+= --enable-db
|
||||
PLIST.db= yes
|
||||
BUILDLINK_TRANSFORM+= l:db:${BDB_TYPE}
|
||||
|
|
Loading…
Reference in a new issue