|
|
@@ -143,7 +143,7 @@ Distribution: OpenPKG [BASE]
|
|
|
Group: Web
|
|
|
License: ASF
|
|
|
Version: %{V_apache}
|
|
|
-Release: 20020907
|
|
|
+Release: 20020913
|
|
|
|
|
|
# list of sources
|
|
|
Source0: http://www.apache.org/dist/httpd/apache_%{V_apache}.tar.gz
|
|
|
@@ -434,23 +434,22 @@ AutoReqProv: no
|
|
|
# optionally prepare mod_php
|
|
|
%if "%{with_mod_php}" == "yes"
|
|
|
( cd php-%{V_mod_php}
|
|
|
- CC="%{l_cc}" \
|
|
|
+ CC="%{l_cc}"; export CC
|
|
|
+ CFLAGS="%{l_cflags -O} -I%{l_prefix}/include"; export CFLAGS
|
|
|
+ CPPFLAGS="%{l_cflags -O} -I%{l_prefix}/include"; export CPPFLAGS
|
|
|
+ LDFLAGS="%{l_cflags -O} -L%{l_prefix}/lib"; export LDFLAGS
|
|
|
+ LIBS=""; export LIBS
|
|
|
%if "%{with_mod_ssl}" == "yes"
|
|
|
- CFLAGS="%{l_cflags -O} -I%{l_prefix}/include -DEAPI" \
|
|
|
-%else
|
|
|
- CFLAGS="%{l_cflags -O} -I%{l_prefix}/include" \
|
|
|
+ CFLAGS="$CFLAGS -DEAPI"
|
|
|
%endif
|
|
|
- CPPFLAGS="%{l_cflags -O} -I%{l_prefix}/include" \
|
|
|
- LDFLAGS="%{l_cflags -O} -L%{l_prefix}/lib" \
|
|
|
-%if "%{with_mod_php_gd}" == "yes" && "%{with_mod_php_gettext}" == "yes"
|
|
|
- LIBS="-lpng -lz -liconv" \
|
|
|
-%else
|
|
|
-%if "%{with_mod_php_gd}" == "yes"
|
|
|
- LIBS="-lpng -lz" \
|
|
|
+%if "%{with_mod_php_gd}" == "yes"
|
|
|
+ LIBS="$LIBS -lpng -lz"
|
|
|
%endif
|
|
|
%if "%{with_mod_php_gettext}" == "yes"
|
|
|
- LIBS="-liconv" \
|
|
|
+ LIBS="$LIBS -liconv" \
|
|
|
%endif
|
|
|
+%if "%{with_mod_php_openldap}" == "yes"
|
|
|
+ LIBS="$LIBS -lsasl2"
|
|
|
%endif
|
|
|
./configure \
|
|
|
--prefix=%{l_prefix} \
|
