--- a/usr/src/cmd/php5/Makefile.sfw	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/php5/Makefile.sfw	Sat Jan 16 18:11:20 2010 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"@(#)Makefile.sfw	1.34	09/11/25 SMI"
+#pragma ident	"@(#)Makefile.sfw	1.37	09/12/23 SMI"
 
 PHP_REL=5.2
 #
@@ -306,7 +306,7 @@
 		--with-snmp=shared,$(ROOT)/usr \
 		--with-sqlite=shared \
 		--with-tidy=shared,$(ROOT)/usr \
-		--with-zlib=shared \
+		--with-zlib \
 		--without-tsrm-pthreads )
 
 	# Configuring fast/cgi source tree
@@ -332,7 +332,8 @@
 		gpatch -p1 -i ../patches/php_dl.c.patch && \
 		gpatch -p1 -i ../patches/php_6818228.patch && \
 		gpatch -p1 -i ../patches/php_6825797.patch && \
-		gpatch -p1 -i ../patches/php_perf_avoid_setitimer.patch && \
+		gpatch -p1 -i ../patches/php_6912354.patch && \
+		gpatch -p1 -i ../patches/php_perf_zend_execute_inline.patch && \
 		gpatch -p1 -i ../patches/php_perf_safe_address.patch && \
 		gpatch -p1 -i ../patches/php_run-tests.php.patch)
 	(cd $(PHP_DIR); env - $(PRECONF_ENVLINE) \