From f4b374fdd1bf52b29d21e96e9210097e686c695f Mon Sep 17 00:00:00 2001 From: xtraeme Date: Fri, 29 Oct 2004 07:07:44 +0000 Subject: Use mk/mysql.buildlink3.mk instead of databases/mysql-client/buildlink3.mk, so that we'd not force dependance on specific MySQL version, and instead pick the currently installed mysql*-client (or install the default if there is no mysql-client package installed yet) this makes package buildable with arbitrary MySQL version, such as 3.23.x, 4.0.x or 4.1.x --- chat/jabberd2/options.mk | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'chat/jabberd2') diff --git a/chat/jabberd2/options.mk b/chat/jabberd2/options.mk index 57f40d23527..7575003c514 100644 --- a/chat/jabberd2/options.mk +++ b/chat/jabberd2/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.1 2004/08/07 14:29:20 xtraeme Exp $ +# $NetBSD: options.mk,v 1.2 2004/10/29 07:07:44 xtraeme Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.jabberd2 -PKG_SUPPORTED_OPTIONS= db mysql mysql4 pgsql ldap pam +PKG_SUPPORTED_OPTIONS= db mysql pgsql ldap pam .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mdb) @@ -15,13 +15,7 @@ CONFIGURE_ARGS+= --enable-db .if !empty(PKG_OPTIONS:Mmysql) CONFIGURE_ARGS+= --enable-mysql CPPFLAGS+= -I${BUILDLINK_PREFIX.mysql-client}/include/mysql -. include "../../databases/mysql-client/buildlink3.mk" -.endif - -.if !empty(PKG_OPTIONS:Mmysql4) -CONFIGURE_ARGS+= --enable-mysql -CPPFLAGS+= -I${BUILDLINK_PREFIX.mysql-client}/include/mysql -. include "../../databases/mysql4-client/buildlink3.mk" +. include "../../mk/mysql.buildlink3.mk" .endif .if !empty(PKG_OPTIONS:Mpgsql) -- cgit v1.2.3