SPECS: php4.spec - configure_cache usage in sane form

[glen]

Author: glen                         Date: Thu Apr  6 11:08:13 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- configure_cache usage in sane form

---- Files affected:
SPECS:
   php4.spec (1.537 -> 1.538) 

---- Diffs:

================================================================
Index: SPECS/php4.spec
diff -u SPECS/php4.spec:1.537 SPECS/php4.spec:1.538
--- SPECS/php4.spec:1.537	Wed Apr  5 23:14:52 2006
+++ SPECS/php4.spec	Thu Apr  6 13:08:08 2006
@@ -71,7 +71,7 @@
 %undefine	with_msession
 %endif
 
-%define	_rel 9.22
+%define	_rel 9.23
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr):	Le langage de script embarque-HTML PHP
 Summary(pl):	Język skryptowy PHP
@@ -1701,12 +1701,6 @@
 	exit 1
 fi
 
-%if 0%{?configure_cache:1}
-	if [ -f %{configure_cache_file:-$RPM_BUILD_ROOT.configure.cache} ]; then
-		cp -f %{configure_cache_file:-$RPM_BUILD_ROOT.configure.cache} config.cache
-	fi
-%endif
-
 EXTENSION_DIR="%{extensionsdir}"; export EXTENSION_DIR
 if [ ! -f _built-conf ]; then # configure once (for faster debugging purposes)
 	./buildconf --force
@@ -1754,7 +1748,9 @@
 	;;
 	esac
 	` \
+%if "%{!?configure_cache:0}%{?configure_cache}" == "0"
 	--cache-file=config.cache \
+%endif
 	--with-config-file-path=%{_sysconfdir} \
 	--with-config-file-scan-dir=%{_sysconfdir}/conf.d \
 	--with-exec-dir=%{_bindir} \
@@ -1857,10 +1853,6 @@
 	cp -f main/php_config.h php_config.h.$sapi
 done
 
-%if 0%{?configure_cache:1}
-	cp config.cache %{configure_cache_file:-$RPM_BUILD_ROOT.configure.cache}
-%endif
-
 # must make this first, so modules can link against it.
 %{__make} libphp_common.la
 # FIXME: needed for linking modules with libphp_common.la
@@ -3227,6 +3219,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.538  2006/04/06 11:08:08  glen
+- configure_cache usage in sane form
+
 Revision 1.537  2006/04/05 21:14:52  glen
 - fix libphp_common.la location for extension building
 
================================================================

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