extension modules must be able to override CONFIGURE_ARGS, so include

lang/php/ext.mk before setting CONFIGURE_ARGS

8 files changed, 24 insertions, 16 deletions

diff --git a/databases/php-dba/Makefile b/databases/php-dba/Makefile
index 1d33270182a..ed25f7a0be7 100644
--- a/databases/php-dba/Makefile
+++ b/databases/php-dba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 19:30:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:13 jdolecek Exp $
 
 MODNAME=		dba
 CATEGORIES+=		databases
@@ -7,6 +7,8 @@ COMMENT=		PHP extension for DBM database access
 
 USE_BUILDLINK3=		YES
 
+.include "../../lang/php/ext.mk"
+
 CONFIGURE_ARGS+=	--enable-${MODNAME}=shared
 
 CONFIGURE_ARGS+=	--without-cdb
@@ -23,5 +25,4 @@ CONFIGURE_ARGS+=	--without-ndbm
 .include "../../databases/gdbm/buildlink3.mk"
 .endif
 
-.include "../../lang/php/ext.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/php-dbase/Makefile b/databases/php-dbase/Makefile
index ea97c49d2ea..ca2d7886087 100644
--- a/databases/php-dbase/Makefile
+++ b/databases/php-dbase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 19:30:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:13 jdolecek Exp $
 
 MODNAME=		dbase
 CATEGORIES+=		databases
@@ -7,7 +7,8 @@ COMMENT=		PHP extension for dBase database access
 
 USE_BUILDLINK3=		YES
 
+.include "../../lang/php/ext.mk"
+
 CONFIGURE_ARGS+=	--with-${MODNAME}=shared
 
-.include "../../lang/php/ext.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/php-filepro/Makefile b/databases/php-filepro/Makefile
index ff1a53ad099..03b8c0f4200 100644
--- a/databases/php-filepro/Makefile
+++ b/databases/php-filepro/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 19:30:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:13 jdolecek Exp $
 
 MODNAME=		filepro
 CATEGORIES+=		databases
@@ -7,7 +7,8 @@ COMMENT=		PHP extension for read-only filePro database access
 
 USE_BUILDLINK3=		YES
 
+.include "../../lang/php/ext.mk"
+
 CONFIGURE_ARGS+=	--with-${MODNAME}=shared
 
-.include "../../lang/php/ext.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/php-ldap/Makefile b/databases/php-ldap/Makefile
index 346b9351fb2..5b995c1d0bc 100644
--- a/databases/php-ldap/Makefile
+++ b/databases/php-ldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 19:30:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
 
 MODNAME=		ldap
 PKGREVISION=		# empty
@@ -7,8 +7,9 @@ COMMENT=		PHP extension for LDAP database access
 
 USE_BUILDLINK3=		YES
 
+.include "../../lang/php/ext.mk"
+
 CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${BUILDLINK_PREFIX.openldap}
 
-.include "../../lang/php/ext.mk"
 .include "../../databases/openldap/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/php-mssql/Makefile b/databases/php-mssql/Makefile
index 87ce66e2389..14ff0083984 100644
--- a/databases/php-mssql/Makefile
+++ b/databases/php-mssql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 19:30:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
 
 MODNAME=		mssql
 CATEGORIES+=		databases
@@ -6,8 +6,9 @@ COMMENT=		PHP extension for MS SQL databases
 
 USE_BUILDLINK3=		yes
 
+.include "../../lang/php/ext.mk"
+
 CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${BUILDLINK_DIR}/freetds
 
-.include "../../lang/php/ext.mk"
 .include "../../databases/freetds/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/php-mysql/Makefile b/databases/php-mysql/Makefile
index cc4f1812717..33819c91152 100644
--- a/databases/php-mysql/Makefile
+++ b/databases/php-mysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 19:30:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
 
 MODNAME=		mysql
 CATEGORIES+=		databases
@@ -10,10 +10,11 @@ MAINTAINER=		tech-pkg@NetBSD.org
 USE_BUILDLINK3=		yes
 USE_PHP_EXT_PATCHES=	yes
 
+.include "../../lang/php/ext.mk"
+
 EVAL_PREFIX+=		MYSQLDIR=mysql-client
 CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${MYSQLDIR}
 LDFLAGS+=		${COMPILER_RPATH_FLAG}${LOCALBASE}/lib/mysql
 
-.include "../../lang/php/ext.mk"
 .include "../../mk/mysql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/php-odbc/Makefile b/databases/php-odbc/Makefile
index 23eff4eaaad..f9655f08e3b 100644
--- a/databases/php-odbc/Makefile
+++ b/databases/php-odbc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 19:30:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
 
 MODNAME=		odbc
 CATEGORIES+=		databases
@@ -7,8 +7,9 @@ COMMENT=		PHP extension for ODBC access
 
 USE_BUILDLINK3=		YES
 
+.include "../../lang/php/ext.mk"
+
 CONFIGURE_ARGS+=	--with-unixODBC=shared,${BUILDLINK_PREFIX.unixodbc}
 
-.include "../../lang/php/ext.mk"
 .include "../../databases/unixodbc/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/php-pgsql/Makefile b/databases/php-pgsql/Makefile
index 24882ec9958..cd2c442b762 100644
--- a/databases/php-pgsql/Makefile
+++ b/databases/php-pgsql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 19:30:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
 
 MODNAME=		pgsql
 PKGREVISION=		# empty
@@ -7,8 +7,9 @@ COMMENT=		PHP extension for PostgreSQL databases
 
 USE_BUILDLINK3=		YES
 
+.include "../../lang/php/ext.mk"
+
 CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${PGSQL_PREFIX}
 
-.include "../../lang/php/ext.mk"
 .include "../../mk/pgsql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"