فهرست منبع

fix XML (Expat based) support. Now you especially you can build with both mod_dav and mod_php (with XML support enabled)

Ralf S. Engelschall 22 سال پیش
والد
کامیت
7d65075d15
1فایلهای تغییر یافته به همراه8 افزوده شده و 4 حذف شده
  1. 8 4
      apache/apache.spec

+ 8 - 4
apache/apache.spec

@@ -60,7 +60,7 @@ Distribution: OpenPKG [BASE]
 Group:        Web
 License:      ASF
 Version:      %{V_apache}
-Release:      20031008
+Release:      20031009
 
 #   package options (suexec related)
 %option       with_suexec               yes
@@ -282,7 +282,7 @@ PreReq:       gettext, libiconv
 BuildPreReq:  imap, openssl
 PreReq:       imap, openssl
 %endif
-%if "%{with_mod_php_xml}" == "yes"
+%if "%{with_mod_dav}" == "yes" || "%{with_mod_php_xml}" == "yes"
 BuildPreReq:  expat
 PreReq:       expat
 %endif
@@ -610,7 +610,10 @@ AutoReqProv:  no
           --with-imap-ssl=%{l_prefix} \
 %endif
 %if "%{with_mod_php_xml}" == "yes"
-          --with-xml=%{l_prefix} \
+          --enable-xml \
+          --with-expat-dir=%{l_prefix} \
+%else
+          --disable-xml \
 %endif
 %if "%{with_mod_php_dom}" == "yes"
           --with-dom=%{l_prefix} \
@@ -721,7 +724,8 @@ AutoReqProv:  no
 %endif
       LDFLAGS="%{l_cflags -O}" \
       ./configure \
-          --with-apache=../apache_%{V_apache}
+          --with-apache=../apache_%{V_apache} \
+          --with-expat=%{l_prefix}
       %{l_make} %{l_mflags}
       %{l_make} %{l_mflags} install
     ) || exit $?