- build recode module

Changed files:
    php4.spec -> 1.334

diff --git a/php4.spec b/php4.spec
index 1006a9d10117bee8b98591817838e3ad8171c469..d97b309ac9bcfdd0a648f4b2a71e92e910327f10 100644 (file)
--- a/php4.spec
+++ b/php4.spec
@@ -59,7 +59,6 @@
 %define        apxs            /usr/sbin/apxs
 # some problems with apache 2.x
 %if %{_apache2}
-%undefine      with_recode
 %undefine      with_mm
 %endif
 %ifnarch %{ix86} sparc sparcv9 ppc
@@ -1450,6 +1449,9 @@ cp php.ini-dist php.ini
 %patch23 -p1
 %patch24 -p1
 
+# conflict seems to be resolved by recode patches
+rm -f ext/recode/config9.m4
+
 %build
 CFLAGS="%{rpmcflags} -DEAPI=1 -I/usr/X11R6/include"
 EXTENSION_DIR="%{extensionsdir}"; export EXTENSION_DIR