SPECS: php.spec - build cleanups, use permanent config.cache if co...

[glen]

Author: glen                         Date: Sun Apr 16 00:47:41 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- build cleanups, use permanent config.cache if configured
- CFLAGS mungling unneccessary, all goes via apxs

---- Files affected:
SPECS:
   php.spec (1.567 -> 1.568) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.567 SPECS/php.spec:1.568
--- SPECS/php.spec:1.567	Sun Apr 16 02:30:58 2006
+++ SPECS/php.spec	Sun Apr 16 02:47:36 2006
@@ -73,7 +73,7 @@
 %undefine	with_msession
 %endif
 
-%define	_rel 9.5
+%define	_rel 9.6
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr):	Le langage de script embarque-HTML PHP
 Summary(pl):	Język skryptowy PHP
@@ -1581,9 +1581,6 @@
 # conflict seems to be resolved by recode patches
 rm -f ext/recode/config9.m4
 
-# new apr
-sed -i -e 's#apr-config#apr-1-config#g' sapi/apache*/*.m4
-
 # remove all bundled libraries not to link with them accidentally
 #rm -rf ext/sqlite/libsqlite
 #rm -rf ext/bcmath/libbcmath
@@ -1615,12 +1612,6 @@
 	exit 1
 fi
 
-CFLAGS="%{rpmcflags} -DEAPI=1 -I/usr/X11R6/include"
-%if %{with apache2}
-# Apache2 CFLAGS. harmless for other SAPIs.
-CFLAGS="$CFLAGS $(%{_bindir}/apr-1-config --includes) $(%{_bindir}/apu-1-config --includes)"
-%endif
-
 EXTENSION_DIR="%{extensionsdir}"; export EXTENSION_DIR
 if [ ! -f _built-conf ]; then # configure once (for faster debugging purposes)
 	rm -f Makefile.{fcgi,cgi,cli,apxs{1,2}} # now remove Makefile copies
@@ -1668,7 +1659,9 @@
 	;;
 	esac
 	` \
+%if "%{!?configure_cache:0}%{?configure_cache}" == "0"
 	--cache-file=config.cache \
+%endif
 	--with-libdir=%{_lib} \
 	--with-config-file-path=%{_sysconfdir} \
 	--with-config-file-scan-dir=%{_sysconfdir}/conf.d \
@@ -3061,6 +3054,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.568  2006/04/16 00:47:36  glen
+- build cleanups, use permanent config.cache if configured
+- CFLAGS mungling unneccessary, all goes via apxs
+
 Revision 1.567  2006/04/16 00:30:58  glen
 - renumber sources
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php.spec?r1=1.567&r2=1.568&f=u