SPECS: php4.spec - add --enable-force-cgi-redirect for cgi sapis; ...

[arekm]

Author: arekm                        Date: Thu Oct 20 08:38:27 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add --enable-force-cgi-redirect for cgi sapis; enable zts for apache2

---- Files affected:
SPECS:
   php4.spec (1.487 -> 1.488) 

---- Diffs:

================================================================
Index: SPECS/php4.spec
diff -u SPECS/php4.spec:1.487 SPECS/php4.spec:1.488
--- SPECS/php4.spec:1.487	Tue Oct 18 15:55:09 2005
+++ SPECS/php4.spec	Thu Oct 20 10:38:22 2005
@@ -45,14 +45,14 @@
 %bcond_without	yaz		# without YAZ extension module
 %bcond_without	apache1		# disable building apache 1.3.x module
 %bcond_without	apache2		# disable building apache 2.x module
-%bcond_with	zts		# enable-experimental-zts
+%bcond_without	zts		# disable enable-experimental-zts (it's disabled for apache 1.3 anyway)
 
 %define apxs1		/usr/sbin/apxs1
 %define	apxs2		/usr/sbin/apxs
 
 # mm is not thread safe
 # ext/session/mod_mm.c:37:3: #error mm is not thread-safe
-%if %{with zts}
+%if %{with zts} && %{without apache1}
 %undefine	with_mm
 %endif
 
@@ -1708,26 +1708,25 @@
 	`
 	case $sapi in
 	cgi)
-		echo --enable-discard-path
+		echo --enable-discard-path --enable-force-cgi-redirect %{?with_mm:--with-mm}
 	;;
 	cli)
-		echo --disable-cgi
+		echo --disable-cgi %{?with_mm:--with-mm}
 	;;
 	fcgi)
-		echo --enable-fastcgi --with-fastcgi=/usr
+		echo --enable-fastcgi --with-fastcgi=/usr --enable-force-cgi-redirect %{?with_mm:--with-mm}
 	;;
 	apxs1)
 		ver=%(rpm -q --qf '%%{version}' apache1-apxs)
-		echo --with-apxs=%{apxs1} --with-apache-version=$ver
+		echo --with-apxs=%{apxs1} --with-apache-version=$ver %{?with_mm:--with-mm}
 	;;
 	apxs2)
 		ver=%(rpm -q --qf '%%{version}' apache-apxs)
-		echo --with-apxs2=%{apxs2} --with-apache-version=$ver
+		echo --with-apxs2=%{apxs2} --with-apache-version=$ver %{?with_zts:--enable-experimental-zts}
 	;;
 	esac
 	` \
 	--cache-file=config.cache \
-	%{?with_zts:--enable-experimental-zts} \
 	--with-config-file-path=%{_sysconfdir} \
 	--with-config-file-scan-dir=%{_sysconfdir}/conf.d \
 	--with-exec-dir=%{_bindir} \
@@ -1738,7 +1737,6 @@
 	--enable-memory-limit \
 	--enable-track-vars \
 	--enable-safe-mode \
-	\
 	--enable-bcmath=shared \
 	--enable-calendar=shared \
 	--enable-ctype=shared \
@@ -1759,7 +1757,6 @@
 	--enable-sysvshm=shared \
 	--enable-sockets=shared \
 	%{?with_recode:--with-recode=shared} \
-	%{?with_mm:--with-mm} \
 	--enable-tokenizer=shared \
 	%{?with_wddx:--enable-wddx=shared} \
 	%{!?with_xml:--disable-xml}%{?with_xml:--enable-xml=shared} \
@@ -3151,6 +3148,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.488  2005/10/20 08:38:22  arekm
+- add --enable-force-cgi-redirect for cgi sapis; enable zts for apache2
+
 Revision 1.487  2005/10/18 13:55:09  glen
 - really do what last commit said
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php4.spec?r1=1.487&r2=1.488&f=u