Browse Source

fix DOM/XML/XSLT dependencies

Ralf S. Engelschall 17 years ago
parent
commit
c9c8494f4f
2 changed files with 18 additions and 4 deletions
  1. 9 2
      apache-php/apache-php.spec
  2. 9 2
      php/php.spec

+ 9 - 2
apache-php/apache-php.spec

@@ -39,7 +39,7 @@ Class:        BASE
 Group:        Web
 License:      PHP
 Version:      %{V_php}
-Release:      20080503
+Release:      20080510
 
 #   package options
 %option       with_suhosin              no
@@ -113,6 +113,14 @@ Release:      20080503
 %undefine     with_zlib
 %define       with_zlib          yes
 %endif
+%if "%{with_xslt}" == "yes"
+%undefine     with_dom
+%define       with_dom           yes
+%endif
+%if "%{with_dom}" == "yes"
+%undefine     with_xml
+%define       with_xml           yes
+%endif
 %if "%{with_pgsql}" == "yes"
 %undefine     with_ssl
 %define       with_ssl           yes
@@ -488,7 +496,6 @@ AutoReqProv:  no
 %endif
 %if "%{with_dom}" == "yes"
         --enable-dom \
-        --with-libxml-dir=%{l_prefix} \
 %else
         --disable-dom \
 %endif

+ 9 - 2
php/php.spec

@@ -39,7 +39,7 @@ Class:        BASE
 Group:        Language
 License:      PHP
 Version:      %{V_php}
-Release:      20080503
+Release:      20080510
 
 #   package options
 %option       with_suhosin              no
@@ -113,6 +113,14 @@ Release:      20080503
 %undefine     with_zlib
 %define       with_zlib          yes
 %endif
+%if "%{with_xslt}" == "yes"
+%undefine     with_dom
+%define       with_dom           yes
+%endif
+%if "%{with_dom}" == "yes"
+%undefine     with_xml
+%define       with_xml           yes
+%endif
 %if "%{with_pgsql}" == "yes"
 %undefine     with_ssl
 %define       with_ssl           yes
@@ -484,7 +492,6 @@ AutoReqProv:  no
 %endif
 %if "%{with_dom}" == "yes"
         --enable-dom \
-        --with-libxml-dir=%{l_prefix} \
 %else
         --disable-dom \
 %endif