SOURCES (AC-branch): rpm.macros, rpm.macros - fix for /* #undef ZT...

[glen]

Author: glen                         Date: Thu Oct 27 16:17:09 2005 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- fix for /* #undef ZTS */

---- Files affected:
SOURCES:
   rpm.macros (1.158.4.70 -> 1.158.4.71) 
SOURCES:
   rpm.macros (1.248 -> 1.249) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.158.4.70 SOURCES/rpm.macros:1.158.4.71
--- SOURCES/rpm.macros:1.158.4.70	Thu Oct 27 16:19:56 2005
+++ SOURCES/rpm.macros	Thu Oct 27 18:17:04 2005
@@ -482,7 +482,7 @@
 %php_debug				%(awk '/#define ZEND_DEBUG/{print $3}' %{__php_includedir}/main/php_config.h 2>/dev/null || echo ERROR)
 %zend_module_api		%(awk '/#define ZEND_MODULE_API_NO/{print $3}' %{__php_includedir}/Zend/zend_modules.h 2>/dev/null || echo ERROR)
 %zend_extension_api		%(awk '/#define ZEND_EXTENSION_API_NO/{print $3}' %{__php_includedir}/Zend/zend_extensions.h 2>/dev/null || echo ERROR)
-%zend_zts				%(awk '/#define ZTS/{print $3}' %{__php_includedir}/main/php_config.h 2>/dev/null || echo ERROR)
+%zend_zts				%(grep -c '#define ZTS 1' %{__php_includedir}/main/php_config.h || echo ERROR)
 
 # helper macro
 %__php_api_requires() Requires: php(%{expand:%1}) = %{expand:%{%{!?2:%{1}}%{?2}}}

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.248 SOURCES/rpm.macros:1.249
--- SOURCES/rpm.macros:1.248	Thu Oct 27 16:19:56 2005
+++ SOURCES/rpm.macros	Thu Oct 27 18:17:04 2005
@@ -483,7 +483,7 @@
 %php_debug				%(awk '/#define ZEND_DEBUG/{print $3}' %{__php_includedir}/main/php_config.h 2>/dev/null || echo ERROR)
 %zend_module_api		%(awk '/#define ZEND_MODULE_API_NO/{print $3}' %{__php_includedir}/Zend/zend_modules.h 2>/dev/null || echo ERROR)
 %zend_extension_api		%(awk '/#define ZEND_EXTENSION_API_NO/{print $3}' %{__php_includedir}/Zend/zend_extensions.h 2>/dev/null || echo ERROR)
-%zend_zts				%(awk '/#define ZTS/{print $3}' %{__php_includedir}/main/php_config.h 2>/dev/null || echo ERROR)
+%zend_zts				%(grep -c '#define ZTS 1' %{__php_includedir}/main/php_config.h || echo ERROR)
 
 # helper macro
 %__php_api_requires() Requires: php(%{expand:%1}) = %{expand:%{%{!?2:%{1}}%{?2}}}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.158.4.70&r2=1.158.4.71&f=u
    http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.248&r2=1.249&f=u