Author: glen Date: Wed Nov 22 11:35:13 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- add filter bcond to simplify configure line
---- Files affected:
SPECS:
php.spec (1.622 -> 1.623)
---- Diffs:
================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.622 SPECS/php.spec:1.623
--- SPECS/php.spec:1.622 Wed Nov 22 12:32:33 2006
+++ SPECS/php.spec Wed Nov 22 12:35:08 2006
@@ -27,6 +27,7 @@
%bcond_with interbase_inst # use InterBase install., not Firebird (BR:
proprietary libs)
%bcond_with oci8 # with Oracle oci8 extension module (BR:
proprietary libs)
%bcond_without curl # without CURL extension module
+%bcond_without filter # without filter extension module
%bcond_without imap # without IMAP extension module
%bcond_with interbase # with InterBase extension module
%bcond_without ldap # without LDAP extension module
@@ -71,6 +72,11 @@
ERROR: You need to select at least one Apache SAPI to build shared modules.
%endif
+# filter depends on pcre
+%if %{without pcre}
+%undefine with_filter
+%endif
+
%define _rel 0.20
Summary: PHP: Hypertext Preprocessor
Summary(fr): Le langage de script embarque-HTML PHP
@@ -1768,7 +1774,8 @@
%{?with_oci8:--with-oci8=shared} \
%{?with_openssl:--with-openssl=shared} \
--with-kerberos \
- %{!?with_pcre:--without-pcre-regex
--disable-filter}%{?with_pcre:--with-pcre-regex=/usr --enable-filter=shared} \
+ %{!?with_pcre:--without-pcre-regex}%{?with_pcre:--with-pcre-regex=/usr}
\
+ %{!?with_filter:--disable-filter}%{?with_filter:--enable-filter=shared}
\
--with-pear=%{php_pear_dir} \
%{!?with_pgsql:--without-pgsql}%{?with_pgsql:--with-pgsql=shared,/usr} \
--with-png-dir=/usr \
@@ -2358,10 +2365,12 @@
%attr(755,root,root) %{extensionsdir}/fdf.so
%endif
+%if %{with filter}
%files filter
%defattr(644,root,root,755)
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/filter.ini
%attr(755,root,root) %{extensionsdir}/filter.so
+%endif
%files exif
%defattr(644,root,root,755)
@@ -2718,6 +2727,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.623 2006/11/22 11:35:08 glen
+- add filter bcond to simplify configure line
+
Revision 1.622 2006/11/22 11:32:33 glen
- sort extension bconds alphabetically
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/php.spec?r1=1.622&r2=1.623&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
