Sun Nov 14 12:09:22 2010 UTC ()
PHP has grown a new flag; disable building the PHP extension as well if we
disable PHP. This fixes the build with PHP disabled.


(tonnerre)
diff -r1.2 -r1.3 pkgsrc/devel/libthrift/options.mk

cvs diff -r1.2 -r1.3 pkgsrc/devel/libthrift/Attic/options.mk (expand / switch to context diff)
--- pkgsrc/devel/libthrift/Attic/options.mk 2010/10/16 11:38:05 1.2
+++ pkgsrc/devel/libthrift/Attic/options.mk 2010/11/14 12:09:22 1.3
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2010/10/16 11:38:05 tonnerre Exp $
+# $NetBSD: options.mk,v 1.3 2010/11/14 12:09:22 tonnerre Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.libthrift
 PKG_SUPPORTED_OPTIONS=	csharp java erlang python perl php ruby
@@ -57,7 +57,7 @@
 USE_TOOLS+=		perl
 PLIST.perl=		yes
 
-PERL5_PACKLIST=		auto/Thrift/.packlist
+#PERL5_PACKLIST=		auto/Thrift/.packlist
 
 .include "../../lang/perl5/module.mk"
 .else
@@ -67,11 +67,13 @@
 
 .if !empty(PKG_OPTIONS:Mphp)
 CONFIGURE_ARGS+=	--with-php
+CONFIGURE_ARGS+=	--with-php_extension
 CONFIGURE_ARGS+=	--enable-gen-php
 
 .include "../../lang/php/ext.mk"
 .else
 CONFIGURE_ARGS+=	--without-php
+CONFIGURE_ARGS+=	--without-php_extension
 CONFIGURE_ARGS+=	--disable-gen-php
 .endif