OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 13-Sep-2002 13:24:47
Branch: HEAD Handle: 2002091312244600
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
fix dependencies inside PHP
Summary:
Revision Changes Path
1.84 +13 -14 openpkg-src/apache/apache.spec
1.1539 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
Index: openpkg-src/apache/apache.spec
============================================================
$ cvs diff -u -r1.83 -r1.84 apache.spec
--- openpkg-src/apache/apache.spec 7 Sep 2002 07:06:52 -0000 1.83
+++ openpkg-src/apache/apache.spec 13 Sep 2002 11:24:46 -0000 1.84
@@ -143,7 +143,7 @@
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 @@
# 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" \
-%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" \
+ CFLAGS="$CFLAGS -DEAPI"
+%endif
+%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} \
Index: openpkg-web/news.txt
============================================================
$ cvs diff -u -r1.1538 -r1.1539 news.txt
--- openpkg-web/news.txt 13 Sep 2002 11:14:29 -0000 1.1538
+++ openpkg-web/news.txt 13 Sep 2002 11:24:46 -0000 1.1539
@@ -1,3 +1,4 @@
+13-Sep-2002: Upgraded package: P<apache-1.3.26-20020913>
13-Sep-2002: Upgraded package: P<openldap-2.1.4-20020913>
13-Sep-2002: Upgraded package: P<imagemagick-5.4.9.1-20020913>
13-Sep-2002: Upgraded package: P<perl-time-20020913-20020913>
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
