SPECS: php4.spec - always enable zts (to avoid chaos)

[arekm]

Author: arekm                        Date: Thu Oct 20 08:40:46 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- always enable zts (to avoid chaos)

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

---- Diffs:

================================================================
Index: SPECS/php4.spec
diff -u SPECS/php4.spec:1.488 SPECS/php4.spec:1.489
--- SPECS/php4.spec:1.488	Thu Oct 20 10:38:22 2005
+++ SPECS/php4.spec	Thu Oct 20 10:40:41 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_without	zts		# disable enable-experimental-zts (it's disabled for apache 1.3 anyway)
+%bcond_without	zts		# disable enable-experimental-zts
 
 %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} && %{without apache1}
+%if %{with zts}
 %undefine	with_mm
 %endif
 
@@ -1708,21 +1708,21 @@
 	`
 	case $sapi in
 	cgi)
-		echo --enable-discard-path --enable-force-cgi-redirect %{?with_mm:--with-mm}
+		echo --enable-discard-path --enable-force-cgi-redirect
 	;;
 	cli)
-		echo --disable-cgi %{?with_mm:--with-mm}
+		echo --disable-cgi
 	;;
 	fcgi)
-		echo --enable-fastcgi --with-fastcgi=/usr --enable-force-cgi-redirect %{?with_mm:--with-mm}
+		echo --enable-fastcgi --with-fastcgi=/usr --enable-force-cgi-redirect
 	;;
 	apxs1)
 		ver=%(rpm -q --qf '%%{version}' apache1-apxs)
-		echo --with-apxs=%{apxs1} --with-apache-version=$ver %{?with_mm:--with-mm}
+		echo --with-apxs=%{apxs1} --with-apache-version=$ver
 	;;
 	apxs2)
 		ver=%(rpm -q --qf '%%{version}' apache-apxs)
-		echo --with-apxs2=%{apxs2} --with-apache-version=$ver %{?with_zts:--enable-experimental-zts}
+		echo --with-apxs2=%{apxs2} --with-apache-version=$ver
 	;;
 	esac
 	` \
@@ -1731,6 +1731,7 @@
 	--with-config-file-scan-dir=%{_sysconfdir}/conf.d \
 	--with-exec-dir=%{_bindir} \
 	--%{!?debug:dis}%{?debug:en}able-debug \
+	%{?with_zts:--enable-experimental-zts} \
 	--enable-shared \
 	--disable-static \
 	--enable-magic-quotes \
@@ -3148,6 +3149,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.489  2005/10/20 08:40:41  arekm
+- always enable zts (to avoid chaos)
+
 Revision 1.488  2005/10/20 08:38:22  arekm
 - add --enable-force-cgi-redirect for cgi sapis; enable zts for apache2
 
================================================================

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